diff --git a/.chronus/changes/39_typing-2025-7-6-15-34-22.md b/.chronus/changes/39_typing-2025-7-6-15-34-22.md new file mode 100644 index 00000000000..46cbb237ca0 --- /dev/null +++ b/.chronus/changes/39_typing-2025-7-6-15-34-22.md @@ -0,0 +1,8 @@ +--- +changeKind: fix +packages: + - "@autorest/python" + - "@azure-tools/typespec-python" +--- + +Bump generated code to take full advantage of `3.9` typing \ No newline at end of file diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index a8b278fdcb6..d550e4cdacf 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "~0.15.0", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/_utils/serialization.py b/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/aio/operations/_array_operations.py b/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/aio/operations/_array_operations.py index 64e7eae62e6..27a7d8d05be 100644 --- a/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/aio/operations/_array_operations.py +++ b/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/aio/operations/_array_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -102,7 +102,7 @@ from .._configuration import AutoRestSwaggerBATArrayServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ArrayOperations: # pylint: disable=too-many-public-methods @@ -127,7 +127,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> List[int]: + async def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int or the result of cls(response) @@ -140,12 +140,12 @@ async def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -173,7 +173,7 @@ async def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> List[int]: + async def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int or the result of cls(response) @@ -186,12 +186,12 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -219,7 +219,7 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> List[int]: + async def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int or the result of cls(response) @@ -232,12 +232,12 @@ async def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -265,7 +265,7 @@ async def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -293,7 +293,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value empty []. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -308,7 +308,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -349,7 +349,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool or the result of cls(response) @@ -362,12 +362,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -396,7 +396,7 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload async def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -427,7 +427,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [true, false, false, true]. :param array_body: Is either a [bool] type or a IO[bytes] type. Required. @@ -442,7 +442,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -483,7 +483,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool or the result of cls(response) @@ -496,12 +496,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -529,7 +529,7 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool or the result of cls(response) @@ -542,12 +542,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -575,7 +575,7 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> List[int]: + async def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -588,12 +588,12 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -622,7 +622,7 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload async def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -653,7 +653,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -668,7 +668,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -709,7 +709,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -722,12 +722,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -755,7 +755,7 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -768,12 +768,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -801,7 +801,7 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> List[int]: + async def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -814,12 +814,12 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -848,7 +848,7 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: @overload async def put_long_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -879,7 +879,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -894,7 +894,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -935,7 +935,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -948,12 +948,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -981,7 +981,7 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -994,12 +994,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1027,7 +1027,7 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> List[float]: + async def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1040,12 +1040,12 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -1074,7 +1074,7 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: @overload async def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1105,7 +1105,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1120,7 +1120,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1161,7 +1161,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -1174,12 +1174,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -1207,7 +1207,7 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -1220,12 +1220,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -1253,7 +1253,7 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> List[float]: + async def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1266,12 +1266,12 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -1300,7 +1300,7 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: @overload async def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1331,7 +1331,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1346,7 +1346,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1387,7 +1387,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -1400,12 +1400,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -1433,7 +1433,7 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -1446,12 +1446,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -1479,7 +1479,7 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> List[str]: + async def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str or the result of cls(response) @@ -1492,12 +1492,12 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -1526,7 +1526,7 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: @overload async def put_string_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1557,7 +1557,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -1572,7 +1572,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1613,7 +1613,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + async def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum or the result of cls(response) @@ -1626,12 +1626,12 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_get_enum_valid_request( headers=_headers, @@ -1660,7 +1660,7 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum @overload async def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1692,7 +1692,7 @@ async def put_enum_valid( @distributed_trace_async async def put_enum_valid( - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1709,7 +1709,7 @@ async def put_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1750,7 +1750,7 @@ async def put_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + async def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 or the result of cls(response) @@ -1763,12 +1763,12 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_get_string_enum_valid_request( headers=_headers, @@ -1797,7 +1797,7 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. @overload async def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1829,7 +1829,7 @@ async def put_string_enum_valid( @distributed_trace_async async def put_string_enum_valid( - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1846,7 +1846,7 @@ async def put_string_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1887,7 +1887,7 @@ async def put_string_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> List[str]: + async def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str or the result of cls(response) @@ -1900,12 +1900,12 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -1933,7 +1933,7 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + async def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str or the result of cls(response) @@ -1946,12 +1946,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -1979,7 +1979,7 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_uuid_valid(self, **kwargs: Any) -> List[str]: + async def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -1993,12 +1993,12 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_valid_request( headers=_headers, @@ -2027,7 +2027,7 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: @overload async def put_uuid_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2060,7 +2060,7 @@ async def put_uuid_valid( """ @distributed_trace_async - async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_uuid_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2076,7 +2076,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2117,7 +2117,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + async def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str or the result of cls(response) @@ -2130,12 +2130,12 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_invalid_chars_request( headers=_headers, @@ -2163,7 +2163,7 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date or the result of cls(response) @@ -2176,12 +2176,12 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -2210,7 +2210,7 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload async def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -2241,7 +2241,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. :param array_body: Is either a [datetime.date] type or a IO[bytes] type. Required. @@ -2256,7 +2256,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2297,7 +2297,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date or the result of cls(response) @@ -2310,12 +2310,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -2343,7 +2343,7 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date or the result of cls(response) @@ -2356,12 +2356,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -2389,7 +2389,7 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2403,12 +2403,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -2437,7 +2437,7 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload async def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2470,7 +2470,7 @@ async def put_date_time_valid( """ @distributed_trace_async - async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put_date_time_valid(self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2486,7 +2486,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2527,7 +2527,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime or the result of cls(response) @@ -2540,12 +2540,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -2573,7 +2573,7 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet return deserialized # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime or the result of cls(response) @@ -2586,12 +2586,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -2619,7 +2619,7 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date return deserialized # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2633,12 +2633,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -2667,7 +2667,7 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date @overload async def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2701,7 +2701,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2718,7 +2718,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2759,7 +2759,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta or the result of cls(response) @@ -2772,12 +2772,12 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -2806,7 +2806,7 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload async def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -2837,7 +2837,7 @@ async def put_duration_valid( """ @distributed_trace_async - async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put_duration_valid(self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :param array_body: Is either a [datetime.timedelta] type or a IO[bytes] type. Required. @@ -2852,7 +2852,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2893,7 +2893,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + async def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -2907,12 +2907,12 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -2941,7 +2941,7 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: @overload async def put_byte_valid( - self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2974,7 +2974,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2990,7 +2990,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3031,7 +3031,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes or the result of cls(response) @@ -3044,12 +3044,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -3077,7 +3077,7 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> List[bytes]: + async def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -3091,12 +3091,12 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -3124,7 +3124,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product or the result of cls(response) @@ -3137,12 +3137,12 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -3170,7 +3170,7 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product or the result of cls(response) @@ -3183,12 +3183,12 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -3216,7 +3216,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3230,12 +3230,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -3263,7 +3263,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3277,12 +3277,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -3310,7 +3310,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3324,12 +3324,12 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -3358,7 +3358,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload async def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3391,7 +3391,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3407,7 +3407,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3448,7 +3448,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str or the result of cls(response) @@ -3461,12 +3461,12 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -3494,7 +3494,7 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str or the result of cls(response) @@ -3507,12 +3507,12 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -3540,7 +3540,7 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3553,12 +3553,12 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -3586,7 +3586,7 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3599,12 +3599,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -3632,7 +3632,7 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + async def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3645,12 +3645,12 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -3679,7 +3679,7 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload async def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -3710,7 +3710,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :param array_body: Is either a [[str]] type or a IO[bytes] type. Required. @@ -3725,7 +3725,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3766,7 +3766,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str or the result of cls(response) @@ -3779,12 +3779,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -3812,7 +3812,7 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str or the result of cls(response) @@ -3825,12 +3825,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -3858,7 +3858,7 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3872,12 +3872,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -3905,7 +3905,7 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3919,12 +3919,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -3952,7 +3952,7 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3966,12 +3966,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -4000,7 +4000,7 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload async def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4033,7 +4033,7 @@ async def put_dictionary_valid( """ @distributed_trace_async - async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any) -> None: + async def put_dictionary_valid(self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4049,7 +4049,7 @@ async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/operations/_array_operations.py b/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/operations/_array_operations.py index 0cdd630d27b..a8a834affa8 100644 --- a/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/operations/_array_operations.py +++ b/packages/autorest.python/samples/specification/azure-mgmt-test/test/azure-mgmt-test/azure/mgmt/test/operations/_array_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1079,7 +1079,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> List[int]: + def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int or the result of cls(response) @@ -1092,12 +1092,12 @@ def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -1125,7 +1125,7 @@ def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> List[int]: + def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int or the result of cls(response) @@ -1138,12 +1138,12 @@ def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -1171,7 +1171,7 @@ def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> List[int]: + def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int or the result of cls(response) @@ -1184,12 +1184,12 @@ def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -1217,7 +1217,7 @@ def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -1246,7 +1246,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty []. @@ -1262,7 +1262,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1303,7 +1303,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool or the result of cls(response) @@ -1316,12 +1316,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -1350,7 +1350,7 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1380,7 +1380,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1396,7 +1396,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1437,7 +1437,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool or the result of cls(response) @@ -1450,12 +1450,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -1483,7 +1483,7 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool or the result of cls(response) @@ -1496,12 +1496,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -1529,7 +1529,7 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> List[int]: + def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -1542,12 +1542,12 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -1576,7 +1576,7 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1608,7 +1608,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1624,7 +1624,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1665,7 +1665,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -1678,12 +1678,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -1711,7 +1711,7 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -1724,12 +1724,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -1757,7 +1757,7 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> List[int]: + def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -1770,12 +1770,12 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -1803,7 +1803,7 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_long_valid(self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_long_valid(self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Required. @@ -1832,7 +1832,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1848,7 +1848,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1889,7 +1889,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -1902,12 +1902,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -1935,7 +1935,7 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -1948,12 +1948,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1981,7 +1981,7 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> List[float]: + def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1994,12 +1994,12 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -2028,7 +2028,7 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: @overload def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2058,7 +2058,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2074,7 +2074,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2115,7 +2115,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -2128,12 +2128,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -2161,7 +2161,7 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -2174,12 +2174,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -2207,7 +2207,7 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> List[float]: + def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -2220,12 +2220,12 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -2254,7 +2254,7 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: @overload def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2284,7 +2284,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2300,7 +2300,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2341,7 +2341,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -2354,12 +2354,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -2387,7 +2387,7 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -2400,12 +2400,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -2433,7 +2433,7 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> List[str]: + def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str or the result of cls(response) @@ -2446,12 +2446,12 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -2479,7 +2479,7 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_string_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_string_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Required. @@ -2508,7 +2508,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2524,7 +2524,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2565,7 +2565,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum or the result of cls(response) @@ -2578,12 +2578,12 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_get_enum_valid_request( headers=_headers, @@ -2612,7 +2612,7 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: @overload def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2642,7 +2642,7 @@ def put_enum_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2659,7 +2659,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2700,7 +2700,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 or the result of cls(response) @@ -2713,12 +2713,12 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_get_string_enum_valid_request( headers=_headers, @@ -2747,7 +2747,7 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] @overload def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2779,7 +2779,7 @@ def put_string_enum_valid( @distributed_trace def put_string_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2796,7 +2796,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2837,7 +2837,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> List[str]: + def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str or the result of cls(response) @@ -2850,12 +2850,12 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -2883,7 +2883,7 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str or the result of cls(response) @@ -2896,12 +2896,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -2929,7 +2929,7 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_uuid_valid(self, **kwargs: Any) -> List[str]: + def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2943,12 +2943,12 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_valid_request( headers=_headers, @@ -2976,7 +2976,7 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_uuid_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_uuid_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3007,7 +3007,7 @@ def put_uuid_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_uuid_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3024,7 +3024,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3065,7 +3065,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str or the result of cls(response) @@ -3078,12 +3078,12 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_invalid_chars_request( headers=_headers, @@ -3111,7 +3111,7 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date or the result of cls(response) @@ -3124,12 +3124,12 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -3158,7 +3158,7 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3188,7 +3188,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3204,7 +3204,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3245,7 +3245,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date or the result of cls(response) @@ -3258,12 +3258,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -3291,7 +3291,7 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date or the result of cls(response) @@ -3304,12 +3304,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -3337,7 +3337,7 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3351,12 +3351,12 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -3385,7 +3385,7 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3419,7 +3419,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3436,7 +3436,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3477,7 +3477,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime or the result of cls(response) @@ -3490,12 +3490,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -3523,7 +3523,7 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime or the result of cls(response) @@ -3536,12 +3536,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -3569,7 +3569,7 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3583,12 +3583,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3617,7 +3617,7 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3651,7 +3651,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3668,7 +3668,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3709,7 +3709,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta or the result of cls(response) @@ -3722,12 +3722,12 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -3756,7 +3756,7 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3788,7 +3788,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3804,7 +3804,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3845,7 +3845,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -3859,12 +3859,12 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -3892,7 +3892,7 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @overload - def put_byte_valid(self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_byte_valid(self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3923,7 +3923,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3940,7 +3940,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3981,7 +3981,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes or the result of cls(response) @@ -3994,12 +3994,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -4027,7 +4027,7 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> List[bytes]: + def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -4041,12 +4041,12 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -4074,7 +4074,7 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product or the result of cls(response) @@ -4087,12 +4087,12 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -4120,7 +4120,7 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product or the result of cls(response) @@ -4133,12 +4133,12 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -4166,7 +4166,7 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -4180,12 +4180,12 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -4213,7 +4213,7 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -4227,12 +4227,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -4260,7 +4260,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4274,12 +4274,12 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -4308,7 +4308,7 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4342,7 +4342,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any + self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4359,7 +4359,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4400,7 +4400,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str or the result of cls(response) @@ -4413,12 +4413,12 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -4446,7 +4446,7 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str or the result of cls(response) @@ -4459,12 +4459,12 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -4492,7 +4492,7 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4505,12 +4505,12 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -4538,7 +4538,7 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4551,12 +4551,12 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -4584,7 +4584,7 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4597,12 +4597,12 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -4631,7 +4631,7 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4661,7 +4661,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4677,7 +4677,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4718,7 +4718,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str or the result of cls(response) @@ -4731,12 +4731,12 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -4764,7 +4764,7 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str or the result of cls(response) @@ -4777,12 +4777,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -4810,7 +4810,7 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4824,12 +4824,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -4857,7 +4857,7 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4871,12 +4871,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -4904,7 +4904,7 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4918,12 +4918,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -4952,7 +4952,7 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4986,7 +4986,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5003,7 +5003,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/_utils/serialization.py b/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/aio/operations/_operations.py b/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/aio/operations/_operations.py index d7e26f197f6..292ee671c25 100644 --- a/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/aio/operations/_operations.py +++ b/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/aio/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -101,7 +101,7 @@ from .._configuration import AutoRestSwaggerBATArrayServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ArrayOperations: # pylint: disable=too-many-public-methods @@ -126,7 +126,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> List[int]: + async def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int @@ -139,12 +139,12 @@ async def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_null_request( headers=_headers, @@ -172,7 +172,7 @@ async def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> List[int]: + async def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int @@ -185,12 +185,12 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_invalid_request( headers=_headers, @@ -218,7 +218,7 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> List[int]: + async def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int @@ -231,12 +231,12 @@ async def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_empty_request( headers=_headers, @@ -264,7 +264,7 @@ async def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -292,7 +292,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value empty []. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -307,7 +307,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -348,7 +348,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool @@ -361,12 +361,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_tfft_request( headers=_headers, @@ -395,7 +395,7 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload async def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -426,7 +426,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [true, false, false, true]. :param array_body: Is either a [bool] type or a IO[bytes] type. Required. @@ -441,7 +441,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -482,7 +482,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool @@ -495,12 +495,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_null_request( headers=_headers, @@ -528,7 +528,7 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool @@ -541,12 +541,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_string_request( headers=_headers, @@ -574,7 +574,7 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> List[int]: + async def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -587,12 +587,12 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_integer_valid_request( headers=_headers, @@ -621,7 +621,7 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload async def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -652,7 +652,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -667,7 +667,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -708,7 +708,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int @@ -721,12 +721,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_null_request( headers=_headers, @@ -754,7 +754,7 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int @@ -767,12 +767,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_string_request( headers=_headers, @@ -800,7 +800,7 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> List[int]: + async def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -813,12 +813,12 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_valid_request( headers=_headers, @@ -847,7 +847,7 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: @overload async def put_long_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -878,7 +878,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -893,7 +893,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -934,7 +934,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int @@ -947,12 +947,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_null_request( headers=_headers, @@ -980,7 +980,7 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int @@ -993,12 +993,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_string_request( headers=_headers, @@ -1026,7 +1026,7 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> List[float]: + async def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -1039,12 +1039,12 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_valid_request( headers=_headers, @@ -1073,7 +1073,7 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: @overload async def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1104,7 +1104,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1119,7 +1119,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1160,7 +1160,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -1173,12 +1173,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_null_request( headers=_headers, @@ -1206,7 +1206,7 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -1219,12 +1219,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_string_request( headers=_headers, @@ -1252,7 +1252,7 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> List[float]: + async def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -1265,12 +1265,12 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_valid_request( headers=_headers, @@ -1299,7 +1299,7 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: @overload async def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1330,7 +1330,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1345,7 +1345,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1386,7 +1386,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -1399,12 +1399,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_null_request( headers=_headers, @@ -1432,7 +1432,7 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -1445,12 +1445,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_string_request( headers=_headers, @@ -1478,7 +1478,7 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> List[str]: + async def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -1491,12 +1491,12 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_valid_request( headers=_headers, @@ -1525,7 +1525,7 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: @overload async def put_string_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1556,7 +1556,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -1571,7 +1571,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1612,7 +1612,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + async def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum @@ -1625,12 +1625,12 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_array_get_enum_valid_request( headers=_headers, @@ -1659,7 +1659,7 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum @overload async def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1691,7 +1691,7 @@ async def put_enum_valid( @distributed_trace_async async def put_enum_valid( - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1708,7 +1708,7 @@ async def put_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1749,7 +1749,7 @@ async def put_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + async def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 @@ -1762,12 +1762,12 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_array_get_string_enum_valid_request( headers=_headers, @@ -1796,7 +1796,7 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. @overload async def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1828,7 +1828,7 @@ async def put_string_enum_valid( @distributed_trace_async async def put_string_enum_valid( - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1845,7 +1845,7 @@ async def put_string_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1886,7 +1886,7 @@ async def put_string_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> List[str]: + async def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str @@ -1899,12 +1899,12 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_null_request( headers=_headers, @@ -1932,7 +1932,7 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + async def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str @@ -1945,12 +1945,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_invalid_request( headers=_headers, @@ -1978,7 +1978,7 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_uuid_valid(self, **kwargs: Any) -> List[str]: + async def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -1992,12 +1992,12 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_valid_request( headers=_headers, @@ -2026,7 +2026,7 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: @overload async def put_uuid_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2059,7 +2059,7 @@ async def put_uuid_valid( """ @distributed_trace_async - async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_uuid_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2075,7 +2075,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2116,7 +2116,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + async def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str @@ -2129,12 +2129,12 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_invalid_chars_request( headers=_headers, @@ -2162,7 +2162,7 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date @@ -2175,12 +2175,12 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_valid_request( headers=_headers, @@ -2209,7 +2209,7 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload async def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -2240,7 +2240,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. :param array_body: Is either a [datetime.date] type or a IO[bytes] type. Required. @@ -2255,7 +2255,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2296,7 +2296,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date @@ -2309,12 +2309,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_null_request( headers=_headers, @@ -2342,7 +2342,7 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date @@ -2355,12 +2355,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_chars_request( headers=_headers, @@ -2388,7 +2388,7 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2402,12 +2402,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_valid_request( headers=_headers, @@ -2436,7 +2436,7 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload async def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2469,7 +2469,7 @@ async def put_date_time_valid( """ @distributed_trace_async - async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put_date_time_valid(self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2485,7 +2485,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2526,7 +2526,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime @@ -2539,12 +2539,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_null_request( headers=_headers, @@ -2572,7 +2572,7 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet return deserialized # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime @@ -2585,12 +2585,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_chars_request( headers=_headers, @@ -2618,7 +2618,7 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date return deserialized # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2632,12 +2632,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_rfc1123_valid_request( headers=_headers, @@ -2666,7 +2666,7 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date @overload async def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2700,7 +2700,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2717,7 +2717,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2758,7 +2758,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta @@ -2771,12 +2771,12 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_array_get_duration_valid_request( headers=_headers, @@ -2805,7 +2805,7 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload async def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -2836,7 +2836,7 @@ async def put_duration_valid( """ @distributed_trace_async - async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put_duration_valid(self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :param array_body: Is either a [datetime.timedelta] type or a IO[bytes] type. Required. @@ -2851,7 +2851,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2892,7 +2892,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + async def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -2906,12 +2906,12 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_valid_request( headers=_headers, @@ -2940,7 +2940,7 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: @overload async def put_byte_valid( - self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2973,7 +2973,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2989,7 +2989,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3030,7 +3030,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes @@ -3043,12 +3043,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_invalid_null_request( headers=_headers, @@ -3076,7 +3076,7 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> List[bytes]: + async def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -3090,12 +3090,12 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_base64_url_request( headers=_headers, @@ -3123,7 +3123,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product @@ -3136,12 +3136,12 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_null_request( headers=_headers, @@ -3169,7 +3169,7 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product @@ -3182,12 +3182,12 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_empty_request( headers=_headers, @@ -3215,7 +3215,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3229,12 +3229,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_null_request( headers=_headers, @@ -3262,7 +3262,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3276,12 +3276,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_empty_request( headers=_headers, @@ -3309,7 +3309,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3323,12 +3323,12 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_valid_request( headers=_headers, @@ -3357,7 +3357,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload async def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3390,7 +3390,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3406,7 +3406,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3447,7 +3447,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str @@ -3460,12 +3460,12 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_null_request( headers=_headers, @@ -3493,7 +3493,7 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str @@ -3506,12 +3506,12 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_empty_request( headers=_headers, @@ -3539,7 +3539,7 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str @@ -3552,12 +3552,12 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_null_request( headers=_headers, @@ -3585,7 +3585,7 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str @@ -3598,12 +3598,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_empty_request( headers=_headers, @@ -3631,7 +3631,7 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + async def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str @@ -3644,12 +3644,12 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_valid_request( headers=_headers, @@ -3678,7 +3678,7 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload async def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -3709,7 +3709,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :param array_body: Is either a [[str]] type or a IO[bytes] type. Required. @@ -3724,7 +3724,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3765,7 +3765,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str @@ -3778,12 +3778,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_null_request( headers=_headers, @@ -3811,7 +3811,7 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str @@ -3824,12 +3824,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_empty_request( headers=_headers, @@ -3857,7 +3857,7 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3871,12 +3871,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_null_request( headers=_headers, @@ -3904,7 +3904,7 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3918,12 +3918,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_empty_request( headers=_headers, @@ -3951,7 +3951,7 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3965,12 +3965,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_valid_request( headers=_headers, @@ -3999,7 +3999,7 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload async def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4032,7 +4032,7 @@ async def put_dictionary_valid( """ @distributed_trace_async - async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any) -> None: + async def put_dictionary_valid(self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4048,7 +4048,7 @@ async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/operations/_operations.py b/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/operations/_operations.py index 0430b362598..08aeb4b3820 100644 --- a/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/operations/_operations.py +++ b/packages/autorest.python/samples/specification/azure-test/test/azure-test/azure/test/_generated/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1078,7 +1078,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> List[int]: + def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int @@ -1091,12 +1091,12 @@ def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_null_request( headers=_headers, @@ -1124,7 +1124,7 @@ def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> List[int]: + def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int @@ -1137,12 +1137,12 @@ def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_invalid_request( headers=_headers, @@ -1170,7 +1170,7 @@ def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> List[int]: + def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int @@ -1183,12 +1183,12 @@ def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_empty_request( headers=_headers, @@ -1216,7 +1216,7 @@ def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -1245,7 +1245,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty []. @@ -1261,7 +1261,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1302,7 +1302,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool @@ -1315,12 +1315,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_tfft_request( headers=_headers, @@ -1349,7 +1349,7 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1379,7 +1379,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1395,7 +1395,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1436,7 +1436,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool @@ -1449,12 +1449,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_null_request( headers=_headers, @@ -1482,7 +1482,7 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool @@ -1495,12 +1495,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_string_request( headers=_headers, @@ -1528,7 +1528,7 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> List[int]: + def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -1541,12 +1541,12 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_integer_valid_request( headers=_headers, @@ -1575,7 +1575,7 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1607,7 +1607,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1623,7 +1623,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1664,7 +1664,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int @@ -1677,12 +1677,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_null_request( headers=_headers, @@ -1710,7 +1710,7 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int @@ -1723,12 +1723,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_string_request( headers=_headers, @@ -1756,7 +1756,7 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> List[int]: + def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -1769,12 +1769,12 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_valid_request( headers=_headers, @@ -1802,7 +1802,7 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_long_valid(self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_long_valid(self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Required. @@ -1831,7 +1831,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1847,7 +1847,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1888,7 +1888,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int @@ -1901,12 +1901,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_null_request( headers=_headers, @@ -1934,7 +1934,7 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int @@ -1947,12 +1947,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_string_request( headers=_headers, @@ -1980,7 +1980,7 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> List[float]: + def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -1993,12 +1993,12 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_valid_request( headers=_headers, @@ -2027,7 +2027,7 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: @overload def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2057,7 +2057,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2073,7 +2073,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2114,7 +2114,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -2127,12 +2127,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_null_request( headers=_headers, @@ -2160,7 +2160,7 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -2173,12 +2173,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_string_request( headers=_headers, @@ -2206,7 +2206,7 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> List[float]: + def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -2219,12 +2219,12 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_valid_request( headers=_headers, @@ -2253,7 +2253,7 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: @overload def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2283,7 +2283,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2299,7 +2299,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2340,7 +2340,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -2353,12 +2353,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_null_request( headers=_headers, @@ -2386,7 +2386,7 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -2399,12 +2399,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_string_request( headers=_headers, @@ -2432,7 +2432,7 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> List[str]: + def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -2445,12 +2445,12 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_valid_request( headers=_headers, @@ -2478,7 +2478,7 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_string_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_string_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Required. @@ -2507,7 +2507,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2523,7 +2523,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2564,7 +2564,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum @@ -2577,12 +2577,12 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_array_get_enum_valid_request( headers=_headers, @@ -2611,7 +2611,7 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: @overload def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2641,7 +2641,7 @@ def put_enum_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2658,7 +2658,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2699,7 +2699,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 @@ -2712,12 +2712,12 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_array_get_string_enum_valid_request( headers=_headers, @@ -2746,7 +2746,7 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] @overload def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2778,7 +2778,7 @@ def put_string_enum_valid( @distributed_trace def put_string_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2795,7 +2795,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2836,7 +2836,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> List[str]: + def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str @@ -2849,12 +2849,12 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_null_request( headers=_headers, @@ -2882,7 +2882,7 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str @@ -2895,12 +2895,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_invalid_request( headers=_headers, @@ -2928,7 +2928,7 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_uuid_valid(self, **kwargs: Any) -> List[str]: + def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2942,12 +2942,12 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_valid_request( headers=_headers, @@ -2975,7 +2975,7 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_uuid_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_uuid_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3006,7 +3006,7 @@ def put_uuid_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_uuid_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3023,7 +3023,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3064,7 +3064,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str @@ -3077,12 +3077,12 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_invalid_chars_request( headers=_headers, @@ -3110,7 +3110,7 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date @@ -3123,12 +3123,12 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_valid_request( headers=_headers, @@ -3157,7 +3157,7 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3187,7 +3187,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3203,7 +3203,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3244,7 +3244,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date @@ -3257,12 +3257,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_null_request( headers=_headers, @@ -3290,7 +3290,7 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date @@ -3303,12 +3303,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_chars_request( headers=_headers, @@ -3336,7 +3336,7 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3350,12 +3350,12 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_valid_request( headers=_headers, @@ -3384,7 +3384,7 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3418,7 +3418,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3435,7 +3435,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3476,7 +3476,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime @@ -3489,12 +3489,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_null_request( headers=_headers, @@ -3522,7 +3522,7 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime @@ -3535,12 +3535,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_chars_request( headers=_headers, @@ -3568,7 +3568,7 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3582,12 +3582,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3616,7 +3616,7 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3650,7 +3650,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3667,7 +3667,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3708,7 +3708,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta @@ -3721,12 +3721,12 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_array_get_duration_valid_request( headers=_headers, @@ -3755,7 +3755,7 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3787,7 +3787,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3803,7 +3803,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3844,7 +3844,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -3858,12 +3858,12 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_valid_request( headers=_headers, @@ -3891,7 +3891,7 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @overload - def put_byte_valid(self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_byte_valid(self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3922,7 +3922,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3939,7 +3939,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3980,7 +3980,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes @@ -3993,12 +3993,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_invalid_null_request( headers=_headers, @@ -4026,7 +4026,7 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> List[bytes]: + def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -4040,12 +4040,12 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_base64_url_request( headers=_headers, @@ -4073,7 +4073,7 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product @@ -4086,12 +4086,12 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_null_request( headers=_headers, @@ -4119,7 +4119,7 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product @@ -4132,12 +4132,12 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_empty_request( headers=_headers, @@ -4165,7 +4165,7 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -4179,12 +4179,12 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_null_request( headers=_headers, @@ -4212,7 +4212,7 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -4226,12 +4226,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_empty_request( headers=_headers, @@ -4259,7 +4259,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4273,12 +4273,12 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_array_get_complex_valid_request( headers=_headers, @@ -4307,7 +4307,7 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4341,7 +4341,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any + self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4358,7 +4358,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4399,7 +4399,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str @@ -4412,12 +4412,12 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_null_request( headers=_headers, @@ -4445,7 +4445,7 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str @@ -4458,12 +4458,12 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_empty_request( headers=_headers, @@ -4491,7 +4491,7 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str @@ -4504,12 +4504,12 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_null_request( headers=_headers, @@ -4537,7 +4537,7 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str @@ -4550,12 +4550,12 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_empty_request( headers=_headers, @@ -4583,7 +4583,7 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str @@ -4596,12 +4596,12 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_valid_request( headers=_headers, @@ -4630,7 +4630,7 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4660,7 +4660,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4676,7 +4676,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4717,7 +4717,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str @@ -4730,12 +4730,12 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_null_request( headers=_headers, @@ -4763,7 +4763,7 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str @@ -4776,12 +4776,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_empty_request( headers=_headers, @@ -4809,7 +4809,7 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4823,12 +4823,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_null_request( headers=_headers, @@ -4856,7 +4856,7 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4870,12 +4870,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_empty_request( headers=_headers, @@ -4903,7 +4903,7 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4917,12 +4917,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_valid_request( headers=_headers, @@ -4951,7 +4951,7 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4985,7 +4985,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5002,7 +5002,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/_utils/serialization.py b/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/aio/operations/_operations.py b/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/aio/operations/_operations.py index 374598e66ca..2e25b962138 100644 --- a/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/aio/operations/_operations.py +++ b/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -64,7 +64,7 @@ async def head200(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -105,7 +105,7 @@ async def head204(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -146,7 +146,7 @@ async def head404(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/operations/_operations.py b/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/operations/_operations.py index 4a667c77f2e..d864e223509 100644 --- a/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/operations/_operations.py +++ b/packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -83,7 +83,7 @@ def head200(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -124,7 +124,7 @@ def head204(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -165,7 +165,7 @@ def head404(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/_utils/serialization.py b/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/aio/operations/_operations.py b/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/aio/operations/_operations.py index 86349d39ef8..801c3be2aa3 100644 --- a/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/aio/operations/_operations.py +++ b/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -64,7 +64,7 @@ async def head200(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -105,7 +105,7 @@ async def head204(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -146,7 +146,7 @@ async def head404(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/operations/_operations.py b/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/operations/_operations.py index 5b58915b38c..9da5db2d187 100644 --- a/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/operations/_operations.py +++ b/packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -83,7 +83,7 @@ def head200(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -124,7 +124,7 @@ def head204(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -165,7 +165,7 @@ def head404(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_operations/_operations.py b/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_operations/_operations.py index c98666b4a7b..62e5cae3949 100644 --- a/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_operations/_operations.py +++ b/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from my.library import CustomDefaultPollingMethod, CustomPager, CustomPoller @@ -35,7 +35,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -85,7 +85,7 @@ def _basic_polling_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -304,7 +304,7 @@ def basic_paging(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_utils/serialization.py b/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py b/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py index 7df348790cc..1aff4fd715d 100644 --- a/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py +++ b/packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from my.library.aio import AsyncCustomDefaultPollingMethod, AsyncCustomPager, AsyncCustomPoller @@ -40,7 +40,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _PollingPagingExampleOperationsMixin( @@ -56,7 +56,7 @@ async def _basic_polling_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -279,7 +279,7 @@ def basic_paging(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_auto_rest_head_test_service.py b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_auto_rest_head_test_service.py index 413af58592a..4c011d7c561 100644 --- a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_auto_rest_head_test_service.py +++ b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_utils/serialization.py b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/_auto_rest_head_test_service.py b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/_auto_rest_head_test_service.py index a95c0062e08..762c509ea13 100644 --- a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/_auto_rest_head_test_service.py +++ b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -68,7 +68,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/operations/_http_success_operations.py b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/operations/_http_success_operations.py index 05073e8186b..62a18a25f5a 100644 --- a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/operations/_http_success_operations.py b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/operations/_http_success_operations.py index 9c2f7ddb414..dfad0063109 100644 --- a/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/operations/_http_success_operations.py +++ b/packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_serialization.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_serialization.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_utils/serialization.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py index e84e9fb235b..66eaf2d26ff 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -43,7 +43,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -73,7 +73,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -116,7 +116,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -461,7 +461,7 @@ async def test_different_calls(self, greeting_in_english: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_operation_group_one_operations.py index d38c6342121..9e44eb86b9d 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -66,7 +66,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/models/_models_py3.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/models/_models_py3.py index b5877d520e4..34bb1adc927 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/models/_models_py3.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py index 404ae4f31ca..6e4c9bb6024 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -152,7 +152,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -195,7 +195,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -423,7 +423,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -539,7 +539,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_operation_group_one_operations.py index 5e604939958..19845178683 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_utils/serialization.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py index 8c3c1e278dd..7df6bb7160d 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -60,7 +60,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -118,7 +118,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py index 98dfc0ce7e7..9cc89ff5a22 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -104,7 +104,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -167,7 +167,7 @@ async def test_three(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_two_operations.py index 4ccfd325cd9..9b9c0501c5b 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -68,7 +68,7 @@ async def test_four(self, parameter_one: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py index 23ca9a258f5..bf8062e2556 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> _mo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py index bc9e2582829..cb18049d336 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -210,7 +210,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_two_operations.py index 81397c6ef9e..ef37df07067 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -90,7 +90,7 @@ def test_four(self, parameter_one: bool, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_utils/serialization.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_utils/serialization.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py index 95b3d4cf3a9..d135f3454f4 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -67,7 +67,7 @@ def test_paging(self, **kwargs: Any) -> AsyncItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -145,7 +145,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py index bd30e2ff1e1..d9fec125d25 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -78,7 +78,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> AsyncItemPaged["_models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -185,7 +185,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py index bfc87390709..d531c665db8 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/aio/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -103,7 +103,7 @@ async def test_four(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -162,7 +162,7 @@ async def test_five(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_models_py3.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_models_py3.py index 7d0d8f6b862..63e574f0250 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_models_py3.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py index af4a9288fa5..0073122a049 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -109,7 +109,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -187,7 +187,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py index e1f441f20b1..06c21c3da65 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -112,7 +112,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -219,7 +219,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py index a95234a9a1d..745a1c5179f 100644 --- a/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -207,7 +207,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py index cf92c57b6cc..378309ea29b 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/aio/operations/_duration_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import AutoRestDurationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DurationOperations: @@ -72,7 +72,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -120,7 +120,7 @@ async def put_positive_duration(self, duration_body: datetime.timedelta, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -167,7 +167,7 @@ async def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/operations/_duration_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/operations/_duration_operations.py index a43267b965e..663c8e01a72 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/operations/_duration_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureBodyDuration/bodyduration/operations/_duration_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -128,7 +128,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -178,7 +178,7 @@ def put_positive_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -225,7 +225,7 @@ def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py index bd6e291c8ed..c711d366419 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/aio/operations/_parameter_grouping_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -36,7 +36,7 @@ from .._configuration import AutoRestParameterGroupingTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ParameterGroupingOperations: @@ -81,7 +81,7 @@ async def post_required( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -147,7 +147,7 @@ async def post_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -207,7 +207,7 @@ async def post_reserved_words( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -270,7 +270,7 @@ async def post_multi_param_groups( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -331,7 +331,7 @@ async def post_shared_parameter_group_object( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -384,7 +384,7 @@ async def group_with_constant(self, grouper: Optional[_models.Grouper] = None, * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py index 527c247236e..577aa1af475 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureParameterGrouping/azureparametergrouping/operations/_parameter_grouping_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestParameterGroupingTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -225,7 +225,7 @@ def post_required( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -291,7 +291,7 @@ def post_optional( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -351,7 +351,7 @@ def post_reserved_words( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -414,7 +414,7 @@ def post_multi_param_groups( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -475,7 +475,7 @@ def post_shared_parameter_group_object( # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -530,7 +530,7 @@ def group_with_constant( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/_auto_rest_report_service_for_azure_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/_auto_rest_report_service_for_azure_operations.py index 2463c4c1887..fa6085e46d3 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/_auto_rest_report_service_for_azure_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/aio/operations/_auto_rest_report_service_for_azure_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import AutoRestReportServiceForAzureConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestReportServiceForAzureOperationsMixin( @@ -36,7 +36,7 @@ class _AutoRestReportServiceForAzureOperationsMixin( ): @distributed_trace_async - async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :param qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' in @@ -53,12 +53,12 @@ async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_report_request( qualifier=qualifier, diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/operations/_auto_rest_report_service_for_azure_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/operations/_auto_rest_report_service_for_azure_operations.py index 63ece79bf65..d5d6f55147e 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/operations/_auto_rest_report_service_for_azure_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureReport/azurereport/operations/_auto_rest_report_service_for_azure_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -58,7 +58,7 @@ class _AutoRestReportServiceForAzureOperationsMixin( ): @distributed_trace - def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :param qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' in @@ -75,12 +75,12 @@ def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_report_request( qualifier=qualifier, diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_default_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_default_operations.py index 2f96b15df43..ac3e9dd0fe0 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_default_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_default_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -35,7 +35,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ApiVersionDefaultOperations: @@ -73,7 +73,7 @@ async def get_method_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -117,7 +117,7 @@ async def get_method_global_not_provided_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -161,7 +161,7 @@ async def get_path_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -205,7 +205,7 @@ async def get_swagger_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_local_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_local_operations.py index 6b7581a14a7..3ef159423e3 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_local_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_api_version_local_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from msrest import Deserializer, Serializer @@ -35,7 +35,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ApiVersionLocalOperations: @@ -73,7 +73,7 @@ async def get_method_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -120,7 +120,7 @@ async def get_method_local_null(self, api_version: Optional[str] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def get_path_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -207,7 +207,7 @@ async def get_swagger_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py index 905b69e0732..1eb6ba9bc2b 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_header_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -34,7 +34,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: @@ -74,7 +74,7 @@ async def custom_named_request_id(self, foo_client_request_id: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -128,7 +128,7 @@ async def custom_named_request_id_param_grouping( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -180,7 +180,7 @@ async def custom_named_request_id_head(self, foo_client_request_id: str, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_odata_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_odata_operations.py index 2fa5da8a1cb..22f662c4f0e 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_odata_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_odata_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OdataOperations: @@ -76,7 +76,7 @@ async def get_with_filter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_skip_url_encoding_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_skip_url_encoding_operations.py index 00fdfd6badd..8176f72c0a7 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_skip_url_encoding_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_skip_url_encoding_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from msrest import Deserializer, Serializer @@ -38,7 +38,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SkipUrlEncodingOperations: @@ -78,7 +78,7 @@ async def get_method_path_valid(self, unencoded_path_param: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -123,7 +123,7 @@ async def get_path_valid(self, unencoded_path_param: str, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -166,7 +166,7 @@ async def get_swagger_path_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -212,7 +212,7 @@ async def get_method_query_valid(self, q1: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -257,7 +257,7 @@ async def get_method_query_null(self, q1: Optional[str] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -302,7 +302,7 @@ async def get_path_query_valid(self, q1: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -345,7 +345,7 @@ async def get_swagger_query_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_credentials_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_credentials_operations.py index eb31ff59635..a73e697d87a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_credentials_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_credentials_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -36,7 +36,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SubscriptionInCredentialsOperations: @@ -75,7 +75,7 @@ async def post_method_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def post_method_global_null(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def post_method_global_not_provided_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -209,7 +209,7 @@ async def post_path_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -253,7 +253,7 @@ async def post_swagger_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_method_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_method_operations.py index 3fb53ab1364..34f3912a020 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_method_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_subscription_in_method_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -34,7 +34,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SubscriptionInMethodOperations: @@ -76,7 +76,7 @@ async def post_method_local_valid(self, subscription_id: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -123,7 +123,7 @@ async def post_method_local_null(self, subscription_id: str, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -170,7 +170,7 @@ async def post_path_local_valid(self, subscription_id: str, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -217,7 +217,7 @@ async def post_swagger_local_valid(self, subscription_id: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_xms_client_request_id_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_xms_client_request_id_operations.py index e00ab050d07..0d89501922f 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_xms_client_request_id_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/aio/operations/_xms_client_request_id_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class XMsClientRequestIdOperations: @@ -68,7 +68,7 @@ async def get(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -113,7 +113,7 @@ async def param_get(self, x_ms_client_request_id: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_default_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_default_operations.py index d7d5a66ab44..9f31a7f6685 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_default_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_default_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -147,7 +147,7 @@ def get_method_global_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -193,7 +193,7 @@ def get_method_global_not_provided_valid( # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -237,7 +237,7 @@ def get_path_global_valid(self, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -281,7 +281,7 @@ def get_swagger_global_valid(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_local_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_local_operations.py index 014ad9d7bca..2a47ffc2155 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_local_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_api_version_local_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -145,7 +145,7 @@ def get_method_local_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -194,7 +194,7 @@ def get_method_local_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -237,7 +237,7 @@ def get_path_local_valid(self, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -281,7 +281,7 @@ def get_swagger_local_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py index 060a048b2d0..1a73104f0f0 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_header_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -30,7 +30,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -123,7 +123,7 @@ def custom_named_request_id( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -177,7 +177,7 @@ def custom_named_request_id_param_grouping( # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -229,7 +229,7 @@ def custom_named_request_id_head(self, foo_client_request_id: str, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_odata_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_odata_operations.py index 54533aa8c1f..faed8d78a62 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_odata_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_odata_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -103,7 +103,7 @@ def get_with_filter( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_skip_url_encoding_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_skip_url_encoding_operations.py index 45135ad7422..97f532ab394 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_skip_url_encoding_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_skip_url_encoding_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -205,7 +205,7 @@ def get_method_path_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -252,7 +252,7 @@ def get_path_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -295,7 +295,7 @@ def get_swagger_path_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -341,7 +341,7 @@ def get_method_query_valid(self, q1: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -388,7 +388,7 @@ def get_method_query_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -433,7 +433,7 @@ def get_path_query_valid(self, q1: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -476,7 +476,7 @@ def get_swagger_query_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_credentials_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_credentials_operations.py index 1b626404a9d..af9b8fa4997 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_credentials_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_credentials_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -186,7 +186,7 @@ def post_method_global_valid(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -230,7 +230,7 @@ def post_method_global_null(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ def post_method_global_not_provided_valid( # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -322,7 +322,7 @@ def post_path_global_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -366,7 +366,7 @@ def post_swagger_global_valid(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_method_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_method_operations.py index 26fb33eebf9..8a684a3e810 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_method_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_subscription_in_method_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -161,7 +161,7 @@ def post_method_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -210,7 +210,7 @@ def post_method_local_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -259,7 +259,7 @@ def post_path_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -308,7 +308,7 @@ def post_swagger_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_xms_client_request_id_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_xms_client_request_id_operations.py index 13b419f3821..1592c684978 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_xms_client_request_id_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/azurespecialproperties/operations/_xms_client_request_id_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -92,7 +92,7 @@ def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def param_get( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py index a1963f30616..e86299c7028 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestParameterizedHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: @@ -68,7 +68,7 @@ async def get_empty(self, account_name: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py index 37bd3dc2b0d..f9884726fb2 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestParameterizedHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -84,7 +84,7 @@ def get_empty(self, account_name: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py index 4b2b92f534f..160118f407d 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/aio/operations/_paging_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Literal, Optional, TypeVar, Union, cast +from typing import Any, AsyncIterator, Callable, Literal, Optional, TypeVar, Union, cast import urllib.parse from custompollerpagerdefinitions.aio import AsyncCustomPager, AsyncCustomPoller @@ -66,7 +66,7 @@ from .._configuration import AutoRestPagingTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: # pylint: disable=too-many-public-methods @@ -107,7 +107,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Produ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -178,7 +178,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -249,7 +249,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -320,7 +320,7 @@ def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -396,7 +396,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -472,7 +472,7 @@ def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged["_models.Product 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -553,7 +553,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -637,7 +637,7 @@ def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -708,7 +708,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -785,7 +785,7 @@ def page_with_max_page_size( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -867,7 +867,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -956,7 +956,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1039,7 +1039,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1111,7 +1111,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged["_mod 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1182,7 +1182,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Pro 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1253,7 +1253,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.P 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1324,7 +1324,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1401,7 +1401,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1474,7 +1474,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1546,7 +1546,7 @@ async def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1623,7 +1623,7 @@ async def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1742,7 +1742,7 @@ def append_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1816,7 +1816,7 @@ def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1891,7 +1891,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py index 4b93c33b5c9..081063e8f4e 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -82,7 +82,7 @@ class OdataProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, odata_next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, odata_next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: @@ -309,7 +309,7 @@ class ProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: @@ -337,7 +337,7 @@ class ProductResultValue(_serialization.Model): } def __init__( - self, *, value: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, value: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword value: @@ -365,7 +365,7 @@ class ProductResultValueWithXMSClientName(_serialization.Model): } def __init__( - self, *, indexes: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, indexes: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword indexes: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py index 761e0e17b3e..e0b982a16d9 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/custompollerpager/operations/_paging_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Literal, Optional, TypeVar, Union, cast +from typing import Any, Callable, Iterator, Literal, Optional, TypeVar, Union, cast import urllib.parse from custompollerpagerdefinitions import CustomPager, CustomPoller @@ -37,7 +37,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -567,7 +567,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -638,7 +638,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -709,7 +709,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Pro 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -780,7 +780,7 @@ def get_single_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -856,7 +856,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -932,7 +932,7 @@ def first_response_empty(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1013,7 +1013,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1097,7 +1097,7 @@ def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1168,7 +1168,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemP 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1243,7 +1243,7 @@ def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1325,7 +1325,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1414,7 +1414,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1497,7 +1497,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1569,7 +1569,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged["_models.P 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1640,7 +1640,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1711,7 +1711,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Produc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1782,7 +1782,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1859,7 +1859,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1932,7 +1932,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2004,7 +2004,7 @@ def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2081,7 +2081,7 @@ def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2200,7 +2200,7 @@ def append_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2274,7 +2274,7 @@ def replace_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2349,7 +2349,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py index 339eb18ab23..c97b7273f77 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/aio/operations/_paging_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -32,7 +32,7 @@ from .._configuration import AutoRestParameterizedHostTestPagingClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: @@ -78,7 +78,7 @@ def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncItemPa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -148,7 +148,7 @@ def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/models/_models_py3.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/models/_models_py3.py index 9202f8a1c3a..9973c706631 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/models/_models_py3.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -107,7 +107,7 @@ class ProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py index 3de84db4e7d..78e58cc7dca 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/CustomUrlPaging/custombaseurlpaging/operations/_paging_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -126,7 +126,7 @@ def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> ItemPaged[" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -196,7 +196,7 @@ def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_auto_rest_head_test_service.py index 9bf0f648fd8..b399d14c74a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py index 0c23a5f2968..2f938791b36 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -68,7 +68,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/operations/_http_success_operations.py index 8a8ac7ca978..2fd0dae921c 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/operations/_http_success_operations.py index 1941449ec47..4a25b34aebd 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Head/head/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_auto_rest_head_exception_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_auto_rest_head_exception_test_service.py index e55e2322b2d..c2b7e29d7aa 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_auto_rest_head_exception_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_auto_rest_head_exception_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py index 959410afb6d..126ae992fe6 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/_auto_rest_head_exception_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -68,7 +68,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/_head_exception_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/_head_exception_operations.py index 64c06dcada9..c3786cb5c02 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/_head_exception_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/aio/operations/_head_exception_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadExceptionTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeadExceptionOperations: @@ -63,7 +63,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -105,7 +105,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -147,7 +147,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/operations/_head_exception_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/operations/_head_exception_operations.py index 9b95fe682f8..4ba1a696f58 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/operations/_head_exception_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/headexceptions/operations/_head_exception_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -128,7 +128,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -170,7 +170,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py index ea1911e90c1..9f57314a1de 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core.credentials import AzureKeyCredential @@ -55,7 +55,7 @@ def __init__(self, credential: AzureKeyCredential, base_url: str = "http://local ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py index e93bb15e676..597f288f666 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core.credentials import AzureKeyCredential @@ -55,7 +55,7 @@ def __init__(self, credential: AzureKeyCredential, base_url: str = "http://local ] self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/_http_success_operations.py index 64150e9413a..e0ec1c49a43 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py index 993cfaed410..a78692bb3be 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/headwithazurekeycredentialpolicy/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py index 292a1db6fd1..bcde739f224 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lr_os_custom_header_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -39,7 +39,7 @@ from .._configuration import AutoRestLongRunningOperationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class LROsCustomHeaderOperations: @@ -72,7 +72,7 @@ async def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -247,7 +247,7 @@ async def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -407,7 +407,7 @@ async def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -561,7 +561,7 @@ async def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py index cad56f5b27f..e6e7a15332b 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lro_retrys_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -42,7 +42,7 @@ from .._configuration import AutoRestLongRunningOperationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class LRORetrysOperations: @@ -75,7 +75,7 @@ async def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -232,7 +232,7 @@ async def _put_async_relative_retry_succeeded_initial( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -404,7 +404,7 @@ async def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -502,7 +502,7 @@ async def _delete202_retry200_initial(self, **kwargs: Any) -> AsyncIterator[byte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -593,7 +593,7 @@ async def _delete_async_relative_retry_succeeded_initial( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -689,7 +689,7 @@ async def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -840,7 +840,7 @@ async def _post_async_relative_retry_succeeded_initial( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py index 9368bd50e24..25676645b9a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lros_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -80,7 +80,7 @@ from .._configuration import AutoRestLongRunningOperationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class LROsOperations: # pylint: disable=too-many-public-methods @@ -113,7 +113,7 @@ async def _put200_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -267,7 +267,7 @@ async def _patch200_succeeded_ignore_headers_initial( # pylint: disable=name-to 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -432,7 +432,7 @@ async def _patch201_retry_with_async_header_initial( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -589,7 +589,7 @@ async def _patch202_retry_with_async_and_location_header_initial( # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -750,7 +750,7 @@ async def _put201_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -902,7 +902,7 @@ async def _post202_list_initial(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -946,7 +946,7 @@ async def _post202_list_initial(self, **kwargs: Any) -> AsyncIterator[bytes]: return deserialized # type: ignore @distributed_trace_async - async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[List[_models.Product]]: + async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[list[_models.Product]]: """Long running put request, service returns a 202 with empty body to first request, returns a 200 with body [{ 'id': '100', 'name': 'foo' }]. @@ -958,7 +958,7 @@ async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[List[_models _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -982,13 +982,13 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller[List[_models.Product]].from_continuation_token( + return AsyncLROPoller[list[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[List[_models.Product]]( + return AsyncLROPoller[list[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @@ -1001,7 +1001,7 @@ async def _put200_succeeded_no_state_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1155,7 +1155,7 @@ async def _put202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1312,7 +1312,7 @@ async def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1469,7 +1469,7 @@ async def _put200_updating_succeeded204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1626,7 +1626,7 @@ async def _put201_creating_failed200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1783,7 +1783,7 @@ async def _put200_acceptedcanceled200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1940,7 +1940,7 @@ async def _put_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2101,7 +2101,7 @@ async def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2273,7 +2273,7 @@ async def _put_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2443,7 +2443,7 @@ async def _put_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2615,7 +2615,7 @@ async def _put_async_no_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2785,7 +2785,7 @@ async def _put_async_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2953,7 +2953,7 @@ async def _put_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3095,7 +3095,7 @@ async def _put_async_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3237,7 +3237,7 @@ async def _put_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3347,7 +3347,7 @@ async def _put_async_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3457,7 +3457,7 @@ async def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3557,7 +3557,7 @@ async def _delete_provisioning202_deleting_failed200_initial( # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3657,7 +3657,7 @@ async def _delete_provisioning202_deletingcanceled200_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3755,7 +3755,7 @@ async def _delete204_succeeded_initial(self, **kwargs: Any) -> AsyncIterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3839,7 +3839,7 @@ async def _delete202_retry200_initial(self, **kwargs: Any) -> AsyncIterator[byte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3934,7 +3934,7 @@ async def _delete202_no_retry204_initial(self, **kwargs: Any) -> AsyncIterator[b 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4029,7 +4029,7 @@ async def _delete_no_header_in_retry_initial(self, **kwargs: Any) -> AsyncIterat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4118,7 +4118,7 @@ async def _delete_async_no_header_in_retry_initial(self, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4207,7 +4207,7 @@ async def _delete_async_retry_succeeded_initial(self, **kwargs: Any) -> AsyncIte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4299,7 +4299,7 @@ async def _delete_async_no_retry_succeeded_initial(self, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4391,7 +4391,7 @@ async def _delete_async_retry_failed_initial(self, **kwargs: Any) -> AsyncIterat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4483,7 +4483,7 @@ async def _delete_async_retrycanceled_initial(self, **kwargs: Any) -> AsyncItera 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4575,7 +4575,7 @@ async def _post200_with_payload_initial(self, **kwargs: Any) -> AsyncIterator[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4666,7 +4666,7 @@ async def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4817,7 +4817,7 @@ async def _post202_no_retry204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4980,7 +4980,7 @@ async def _post_double_headers_final_location_get_initial( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5077,7 +5077,7 @@ async def _post_double_headers_final_azure_header_get_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5175,7 +5175,7 @@ async def _post_double_headers_final_azure_header_get_default_initial( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5270,7 +5270,7 @@ async def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5435,7 +5435,7 @@ async def _post_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5600,7 +5600,7 @@ async def _post_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5757,7 +5757,7 @@ async def _post_async_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py index 3c2d4bd04a4..8d3ef21caad 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/aio/operations/_lrosads_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -62,7 +62,7 @@ from .._configuration import AutoRestLongRunningOperationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class LROSADsOperations: # pylint: disable=too-many-public-methods @@ -95,7 +95,7 @@ async def _put_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -246,7 +246,7 @@ async def _put_non_retry201_creating400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -400,7 +400,7 @@ async def _put_non_retry201_creating400_invalid_json_initial( # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -554,7 +554,7 @@ async def _put_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -721,7 +721,7 @@ async def _delete_non_retry400_initial(self, **kwargs: Any) -> AsyncIterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -809,7 +809,7 @@ async def _delete202_non_retry400_initial(self, **kwargs: Any) -> AsyncIterator[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -897,7 +897,7 @@ async def _delete_async_relative_retry400_initial(self, **kwargs: Any) -> AsyncI 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -991,7 +991,7 @@ async def _post_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1139,7 +1139,7 @@ async def _post202_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1287,7 +1287,7 @@ async def _post_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1441,7 +1441,7 @@ async def _put_error201_no_provisioning_state_payload_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1592,7 +1592,7 @@ async def _put_async_relative_retry_no_status_initial( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1764,7 +1764,7 @@ async def _put_async_relative_retry_no_status_payload_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1934,7 +1934,7 @@ async def _delete204_succeeded_initial(self, **kwargs: Any) -> AsyncIterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2020,7 +2020,7 @@ async def _delete_async_relative_retry_no_status_initial( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2116,7 +2116,7 @@ async def _post202_no_location_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2267,7 +2267,7 @@ async def _post_async_relative_retry_no_payload_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2424,7 +2424,7 @@ async def _put200_invalid_json_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2578,7 +2578,7 @@ async def _put_async_relative_retry_invalid_header_initial( # pylint: disable=n 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2750,7 +2750,7 @@ async def _put_async_relative_retry_invalid_json_polling_initial( # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2920,7 +2920,7 @@ async def _delete202_retry_invalid_header_initial(self, **kwargs: Any) -> AsyncI 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3011,7 +3011,7 @@ async def _delete_async_relative_retry_invalid_header_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3107,7 +3107,7 @@ async def _delete_async_relative_retry_invalid_json_polling_initial( # pylint: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3203,7 +3203,7 @@ async def _post202_retry_invalid_header_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3354,7 +3354,7 @@ async def _post_async_relative_retry_invalid_header_initial( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3511,7 +3511,7 @@ async def _post_async_relative_retry_invalid_json_polling_initial( # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py index 3b2e9443b08..5d065db6ea3 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Dict, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -106,7 +106,7 @@ class Resource(_serialization.Model): "name": {"key": "name", "type": "str"}, } - def __init__(self, *, tags: Optional[Dict[str, str]] = None, location: Optional[str] = None, **kwargs: Any) -> None: + def __init__(self, *, tags: Optional[dict[str, str]] = None, location: Optional[str] = None, **kwargs: Any) -> None: """ :keyword tags: Dictionary of :code:``. :paramtype tags: dict[str, str] @@ -163,7 +163,7 @@ class Product(Resource): def __init__( self, *, - tags: Optional[Dict[str, str]] = None, + tags: Optional[dict[str, str]] = None, location: Optional[str] = None, provisioning_state: Optional[str] = None, **kwargs: Any diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py index 5fd234ecc8f..73658dd1e6d 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lr_os_custom_header_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -137,7 +137,7 @@ def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -309,7 +309,7 @@ def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -466,7 +466,7 @@ def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -620,7 +620,7 @@ def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py index a0a324033f9..fbd6bb1f55e 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lro_retrys_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -182,7 +182,7 @@ def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -336,7 +336,7 @@ def _put_async_relative_retry_succeeded_initial( # pylint: disable=name-too-lon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -505,7 +505,7 @@ def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -602,7 +602,7 @@ def _delete202_retry200_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -693,7 +693,7 @@ def _delete_async_relative_retry_succeeded_initial( # pylint: disable=name-too- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -789,7 +789,7 @@ def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -940,7 +940,7 @@ def _post_async_relative_retry_succeeded_initial( # pylint: disable=name-too-lo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py index 31c3cf5883d..f45fc00242c 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lros_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -779,7 +779,7 @@ def _put200_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -930,7 +930,7 @@ def _patch200_succeeded_ignore_headers_initial( # pylint: disable=name-too-long 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1092,7 +1092,7 @@ def _patch201_retry_with_async_header_initial( # pylint: disable=name-too-long 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1246,7 +1246,7 @@ def _patch202_retry_with_async_and_location_header_initial( # pylint: disable=n 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1404,7 +1404,7 @@ def _put201_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1553,7 +1553,7 @@ def _post202_list_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1597,7 +1597,7 @@ def _post202_list_initial(self, **kwargs: Any) -> Iterator[bytes]: return deserialized # type: ignore @distributed_trace - def begin_post202_list(self, **kwargs: Any) -> LROPoller[List[_models.Product]]: + def begin_post202_list(self, **kwargs: Any) -> LROPoller[list[_models.Product]]: """Long running put request, service returns a 202 with empty body to first request, returns a 200 with body [{ 'id': '100', 'name': 'foo' }]. @@ -1609,7 +1609,7 @@ def begin_post202_list(self, **kwargs: Any) -> LROPoller[List[_models.Product]]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -1631,13 +1631,13 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller[List[_models.Product]].from_continuation_token( + return LROPoller[list[_models.Product]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[List[_models.Product]]( + return LROPoller[list[_models.Product]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @@ -1650,7 +1650,7 @@ def _put200_succeeded_no_state_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1801,7 +1801,7 @@ def _put202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1955,7 +1955,7 @@ def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2109,7 +2109,7 @@ def _put200_updating_succeeded204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2263,7 +2263,7 @@ def _put201_creating_failed200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2417,7 +2417,7 @@ def _put200_acceptedcanceled200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2571,7 +2571,7 @@ def _put_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2729,7 +2729,7 @@ def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2898,7 +2898,7 @@ def _put_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3065,7 +3065,7 @@ def _put_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3234,7 +3234,7 @@ def _put_async_no_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3401,7 +3401,7 @@ def _put_async_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3566,7 +3566,7 @@ def _put_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3706,7 +3706,7 @@ def _put_async_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3844,7 +3844,7 @@ def _put_sub_resource_initial(self, provisioning_state: Optional[str] = None, ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3953,7 +3953,7 @@ def _put_async_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4062,7 +4062,7 @@ def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4161,7 +4161,7 @@ def _delete_provisioning202_deleting_failed200_initial( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4260,7 +4260,7 @@ def _delete_provisioning202_deletingcanceled200_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4357,7 +4357,7 @@ def _delete204_succeeded_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4441,7 +4441,7 @@ def _delete202_retry200_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4535,7 +4535,7 @@ def _delete202_no_retry204_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4629,7 +4629,7 @@ def _delete_no_header_in_retry_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4718,7 +4718,7 @@ def _delete_async_no_header_in_retry_initial(self, **kwargs: Any) -> Iterator[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4807,7 +4807,7 @@ def _delete_async_retry_succeeded_initial(self, **kwargs: Any) -> Iterator[bytes 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4899,7 +4899,7 @@ def _delete_async_no_retry_succeeded_initial(self, **kwargs: Any) -> Iterator[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4991,7 +4991,7 @@ def _delete_async_retry_failed_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5083,7 +5083,7 @@ def _delete_async_retrycanceled_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5175,7 +5175,7 @@ def _post200_with_payload_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5264,7 +5264,7 @@ def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5415,7 +5415,7 @@ def _post202_no_retry204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5575,7 +5575,7 @@ def _post_double_headers_final_location_get_initial( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5671,7 +5671,7 @@ def _post_double_headers_final_azure_header_get_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5767,7 +5767,7 @@ def _post_double_headers_final_azure_header_get_default_initial( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5861,7 +5861,7 @@ def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6023,7 +6023,7 @@ def _post_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6185,7 +6185,7 @@ def _post_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6342,7 +6342,7 @@ def _post_async_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py index fe3e85eb4fe..46373ad218f 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Lro/lro/operations/_lrosads_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -506,7 +506,7 @@ def _put_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -654,7 +654,7 @@ def _put_non_retry201_creating400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -805,7 +805,7 @@ def _put_non_retry201_creating400_invalid_json_initial( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -956,7 +956,7 @@ def _put_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1120,7 +1120,7 @@ def _delete_non_retry400_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1208,7 +1208,7 @@ def _delete202_non_retry400_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1296,7 +1296,7 @@ def _delete_async_relative_retry400_initial(self, **kwargs: Any) -> Iterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1390,7 +1390,7 @@ def _post_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1538,7 +1538,7 @@ def _post202_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1686,7 +1686,7 @@ def _post_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1840,7 +1840,7 @@ def _put_error201_no_provisioning_state_payload_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1988,7 +1988,7 @@ def _put_async_relative_retry_no_status_initial( # pylint: disable=name-too-lon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2157,7 +2157,7 @@ def _put_async_relative_retry_no_status_payload_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2324,7 +2324,7 @@ def _delete204_succeeded_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2410,7 +2410,7 @@ def _delete_async_relative_retry_no_status_initial( # pylint: disable=name-too- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2506,7 +2506,7 @@ def _post202_no_location_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2657,7 +2657,7 @@ def _post_async_relative_retry_no_payload_initial( # pylint: disable=name-too-l 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2814,7 +2814,7 @@ def _put200_invalid_json_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2965,7 +2965,7 @@ def _put_async_relative_retry_invalid_header_initial( # pylint: disable=name-to 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3134,7 +3134,7 @@ def _put_async_relative_retry_invalid_json_polling_initial( # pylint: disable=n 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3301,7 +3301,7 @@ def _delete202_retry_invalid_header_initial(self, **kwargs: Any) -> Iterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3392,7 +3392,7 @@ def _delete_async_relative_retry_invalid_header_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3488,7 +3488,7 @@ def _delete_async_relative_retry_invalid_json_polling_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3584,7 +3584,7 @@ def _post202_retry_invalid_header_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3735,7 +3735,7 @@ def _post_async_relative_retry_invalid_header_initial( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3892,7 +3892,7 @@ def _post_async_relative_retry_invalid_json_polling_initial( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py index 2090105ce0d..2c19f538234 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/aio/operations/_lro_with_paramaterized_endpoints_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Literal, Optional, TypeVar, Union, cast +from typing import Any, AsyncIterator, Callable, Literal, Optional, TypeVar, Union, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import LROWithParamaterizedEndpointsConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _LROWithParamaterizedEndpointsOperationsMixin( @@ -51,7 +51,7 @@ async def _poll_with_parameterized_endpoints_initial( # pylint: disable=name-to 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def _poll_with_constant_parameterized_endpoints_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py index 1333431aeb5..d427784f978 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/LroWithParameterizedEndpoints/lrowithparameterizedendpoints/operations/_lro_with_paramaterized_endpoints_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Literal, Optional, TypeVar, Union, cast +from typing import Any, Callable, Iterator, Literal, Optional, TypeVar, Union, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def _poll_with_parameterized_endpoints_initial( # pylint: disable=name-too-long 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -199,7 +199,7 @@ def _poll_with_constant_parameterized_endpoints_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_default_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_default_operations.py index 4b6ddacce93..004bb20e1e9 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_default_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_default_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ApiVersionDefaultOperations: @@ -69,7 +69,7 @@ async def get_method_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -113,7 +113,7 @@ async def get_method_global_not_provided_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -157,7 +157,7 @@ async def get_path_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -201,7 +201,7 @@ async def get_swagger_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_local_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_local_operations.py index e55e44c4c98..1828335a679 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_local_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_api_version_local_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ApiVersionLocalOperations: @@ -69,7 +69,7 @@ async def get_method_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -116,7 +116,7 @@ async def get_method_local_null(self, api_version: Optional[str] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -159,7 +159,7 @@ async def get_path_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -203,7 +203,7 @@ async def get_swagger_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_header_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_header_operations.py index 1bbafc405c1..585bb1527a8 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_header_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_header_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: @@ -70,7 +70,7 @@ async def custom_named_request_id(self, foo_client_request_id: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -124,7 +124,7 @@ async def custom_named_request_id_param_grouping( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -176,7 +176,7 @@ async def custom_named_request_id_head(self, foo_client_request_id: str, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_http_success_operations.py index 1d3b2c3fffd..f4a9561cbae 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -63,7 +63,7 @@ async def head200(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -104,7 +104,7 @@ async def head204(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_odata_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_odata_operations.py index c3db3cc5ed0..27f03441e21 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_odata_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_odata_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OdataOperations: @@ -72,7 +72,7 @@ async def get_with_filter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_skip_url_encoding_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_skip_url_encoding_operations.py index e02888a1970..81e64cb9329 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_skip_url_encoding_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_skip_url_encoding_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SkipUrlEncodingOperations: @@ -74,7 +74,7 @@ async def get_method_path_valid(self, unencoded_path_param: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def get_path_valid(self, unencoded_path_param: str, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -162,7 +162,7 @@ async def get_swagger_path_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -208,7 +208,7 @@ async def get_method_query_valid(self, q1: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -253,7 +253,7 @@ async def get_method_query_null(self, q1: Optional[str] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -298,7 +298,7 @@ async def get_path_query_valid(self, q1: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -341,7 +341,7 @@ async def get_swagger_query_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_credentials_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_credentials_operations.py index abe5af69988..29d1e1f092a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_credentials_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_credentials_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SubscriptionInCredentialsOperations: @@ -71,7 +71,7 @@ async def post_method_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -115,7 +115,7 @@ async def post_method_global_null(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -159,7 +159,7 @@ async def post_method_global_not_provided_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -205,7 +205,7 @@ async def post_path_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -249,7 +249,7 @@ async def post_swagger_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_method_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_method_operations.py index 242bc65e81a..52319a76448 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_method_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_subscription_in_method_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SubscriptionInMethodOperations: @@ -72,7 +72,7 @@ async def post_method_local_valid(self, subscription_id: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def post_method_local_null(self, subscription_id: str, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -166,7 +166,7 @@ async def post_path_local_valid(self, subscription_id: str, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def post_swagger_local_valid(self, subscription_id: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_xms_client_request_id_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_xms_client_request_id_operations.py index 48c0c4adba4..e036f2b3e9c 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_xms_client_request_id_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/aio/operations/_xms_client_request_id_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import MixedApiVersionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class XMsClientRequestIdOperations: @@ -64,7 +64,7 @@ async def get(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -109,7 +109,7 @@ async def param_get(self, x_ms_client_request_id: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_default_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_default_operations.py index be60ab16884..16e571b99df 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_default_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_default_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -144,7 +144,7 @@ def get_method_global_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -190,7 +190,7 @@ def get_method_global_not_provided_valid( # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -234,7 +234,7 @@ def get_path_global_valid(self, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -278,7 +278,7 @@ def get_swagger_global_valid(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_local_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_local_operations.py index 865408fcb12..81ed7576cd0 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_local_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_api_version_local_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -142,7 +142,7 @@ def get_method_local_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -191,7 +191,7 @@ def get_method_local_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -234,7 +234,7 @@ def get_path_local_valid(self, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -278,7 +278,7 @@ def get_swagger_local_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_header_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_header_operations.py index 8fb98f2f74a..1558424bd65 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_header_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_header_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -120,7 +120,7 @@ def custom_named_request_id( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -174,7 +174,7 @@ def custom_named_request_id_param_grouping( # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -228,7 +228,7 @@ def custom_named_request_id_head( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_http_success_operations.py index 7df11a3f8fc..9fe20e1654a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def head200(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -127,7 +127,7 @@ def head204(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_odata_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_odata_operations.py index 0140bea7864..7a122ca7c2a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_odata_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_odata_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -100,7 +100,7 @@ def get_with_filter( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_skip_url_encoding_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_skip_url_encoding_operations.py index 7666f99cad9..5bb805efe49 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_skip_url_encoding_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_skip_url_encoding_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -202,7 +202,7 @@ def get_method_path_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -249,7 +249,7 @@ def get_path_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -292,7 +292,7 @@ def get_swagger_path_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -338,7 +338,7 @@ def get_method_query_valid(self, q1: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -385,7 +385,7 @@ def get_method_query_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -430,7 +430,7 @@ def get_path_query_valid(self, q1: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -473,7 +473,7 @@ def get_swagger_query_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_credentials_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_credentials_operations.py index 2cb49cd7703..6eeff6e0c23 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_credentials_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_credentials_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -183,7 +183,7 @@ def post_method_global_valid(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -227,7 +227,7 @@ def post_method_global_null(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -273,7 +273,7 @@ def post_method_global_not_provided_valid( # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -319,7 +319,7 @@ def post_path_global_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -363,7 +363,7 @@ def post_swagger_global_valid(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_method_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_method_operations.py index 95704be963f..4a68078032c 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_method_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_subscription_in_method_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -158,7 +158,7 @@ def post_method_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -207,7 +207,7 @@ def post_method_local_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -256,7 +256,7 @@ def post_path_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -305,7 +305,7 @@ def post_swagger_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_xms_client_request_id_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_xms_client_request_id_operations.py index 1f28e3e820d..831f3e40622 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_xms_client_request_id_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/MixedApiVersion/mixedapiversion/operations/_xms_client_request_id_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -89,7 +89,7 @@ def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -136,7 +136,7 @@ def param_get( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_head_client.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_head_client.py index 1e2c2ac4474..cb336a200dc 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_head_client.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_head_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -64,7 +64,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/_head_client.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/_head_client.py index 35dfe53fc53..1e3c10fed85 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/_head_client.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/_head_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/operations/_http_success_operations.py index ee19e5ad77a..d3f3fde8f72 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import HeadClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/operations/_http_success_operations.py index 13b13ee03f1..11aeb2e3ea0 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/head/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py index bc4083c072a..208f807f57d 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/aio/operations/_paging_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Literal, Optional, TypeVar, Union, cast +from typing import Any, AsyncIterator, Callable, Literal, Optional, TypeVar, Union, cast import urllib.parse from azure.core import AsyncPipelineClient @@ -64,7 +64,7 @@ from .._configuration import PagingClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: # pylint: disable=too-many-public-methods @@ -105,7 +105,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Produ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -176,7 +176,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -247,7 +247,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -318,7 +318,7 @@ def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -394,7 +394,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -470,7 +470,7 @@ def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged["_models.Product 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -551,7 +551,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -635,7 +635,7 @@ def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -706,7 +706,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -783,7 +783,7 @@ def page_with_max_page_size( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -865,7 +865,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -954,7 +954,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1037,7 +1037,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1109,7 +1109,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged["_mod 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1180,7 +1180,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Pro 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1251,7 +1251,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.P 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1322,7 +1322,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1399,7 +1399,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1472,7 +1472,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1544,7 +1544,7 @@ async def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1621,7 +1621,7 @@ async def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1740,7 +1740,7 @@ def append_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1814,7 +1814,7 @@ def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1889,7 +1889,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/models/_models_py3.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/models/_models_py3.py index 36303b8f9d0..d4ce395da09 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/models/_models_py3.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -82,7 +82,7 @@ class OdataProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, odata_next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, odata_next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: @@ -309,7 +309,7 @@ class ProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: @@ -337,7 +337,7 @@ class ProductResultValue(_serialization.Model): } def __init__( - self, *, value: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, value: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword value: @@ -365,7 +365,7 @@ class ProductResultValueWithXMSClientName(_serialization.Model): } def __init__( - self, *, indexes: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, indexes: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword indexes: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py index 2bfd54590ca..92ffecb22a9 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeBatch/azure/packagemode/batch/paging/operations/_paging_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Literal, Optional, TypeVar, Union, cast +from typing import Any, Callable, Iterator, Literal, Optional, TypeVar, Union, cast import urllib.parse from azure.core import PipelineClient @@ -35,7 +35,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -565,7 +565,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -636,7 +636,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -707,7 +707,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Pro 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -778,7 +778,7 @@ def get_single_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -854,7 +854,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -930,7 +930,7 @@ def first_response_empty(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1011,7 +1011,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1095,7 +1095,7 @@ def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1166,7 +1166,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemP 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1241,7 +1241,7 @@ def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1323,7 +1323,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1412,7 +1412,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1495,7 +1495,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1567,7 +1567,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged["_models.P 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1638,7 +1638,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1709,7 +1709,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Produc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1780,7 +1780,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1857,7 +1857,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1930,7 +1930,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2002,7 +2002,7 @@ def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2079,7 +2079,7 @@ def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2198,7 +2198,7 @@ def append_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2272,7 +2272,7 @@ def replace_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2347,7 +2347,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_auto_rest_head_test_service.py index 1c9da1c8548..3408939ae10 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/_auto_rest_head_test_service.py index 730e2872a4f..502650af697 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -68,7 +68,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/operations/_http_success_operations.py index b32ec341aeb..56bc3b2fb93 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/operations/_http_success_operations.py index 0d0d71c30eb..f9fa445bb7b 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeCustomize/azure/packagemode/customize/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_auto_rest_head_test_service.py index 3439c20175e..ee157ee459d 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/_auto_rest_head_test_service.py index f5773529232..b6976277f25 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -68,7 +68,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/operations/_http_success_operations.py index 654c8761749..96dd3a85247 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/operations/_http_success_operations.py index 966dc648324..29dfe286958 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeDataPlane/azure/packagemode/dataplane/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_auto_rest_head_test_service.py index e640f9bc44f..93d22cde02c 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/_auto_rest_head_test_service.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/_auto_rest_head_test_service.py index 3d8ad03d0df..6fa6ac0c016 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/_auto_rest_head_test_service.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/_auto_rest_head_test_service.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -68,7 +68,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/operations/_http_success_operations.py index 46dd74dd5c8..9b373dcc478 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/aio/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -61,7 +61,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/operations/_http_success_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/operations/_http_success_operations.py index d3104fe4ac5..924cb633108 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/operations/_http_success_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/azure/package/mode/operations/_http_success_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py index d120d29bc19..4bcae02fdca 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/aio/operations/_paging_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Literal, Optional, TypeVar, Union, cast +from typing import Any, AsyncIterator, Callable, Literal, Optional, TypeVar, Union, cast import urllib.parse from azure.core import AsyncPipelineClient @@ -63,7 +63,7 @@ from .._configuration import AutoRestPagingTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: # pylint: disable=too-many-public-methods @@ -104,7 +104,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Produ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -175,7 +175,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -246,7 +246,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged["_model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -317,7 +317,7 @@ def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -393,7 +393,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -469,7 +469,7 @@ def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged["_models.Product 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -549,7 +549,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -633,7 +633,7 @@ def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -704,7 +704,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -781,7 +781,7 @@ def page_with_max_page_size( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -863,7 +863,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -952,7 +952,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1035,7 +1035,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1107,7 +1107,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged["_mod 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1178,7 +1178,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.Pro 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1249,7 +1249,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged["_models.P 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1320,7 +1320,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged["_mode 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1397,7 +1397,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1470,7 +1470,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1542,7 +1542,7 @@ async def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1618,7 +1618,7 @@ async def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1737,7 +1737,7 @@ def append_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product"] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1811,7 +1811,7 @@ def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged["_models.Product" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1886,7 +1886,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py index 05b66f11e19..bdc01bfd9c4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -82,7 +82,7 @@ class OdataProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, odata_next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, odata_next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: @@ -309,7 +309,7 @@ class ProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: @@ -337,7 +337,7 @@ class ProductResultValue(_serialization.Model): } def __init__( - self, *, value: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, value: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword value: @@ -365,7 +365,7 @@ class ProductResultValueWithXMSClientName(_serialization.Model): } def __init__( - self, *, indexes: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, indexes: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword indexes: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py index 68e40c36640..e72d7e99fd0 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/Paging/paging/operations/_paging_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Literal, Optional, TypeVar, Union, cast +from typing import Any, Callable, Iterator, Literal, Optional, TypeVar, Union, cast import urllib.parse from azure.core import PipelineClient @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -564,7 +564,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -635,7 +635,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -706,7 +706,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged["_models.Pro 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -777,7 +777,7 @@ def get_single_pages(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -853,7 +853,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -929,7 +929,7 @@ def first_response_empty(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1009,7 +1009,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1093,7 +1093,7 @@ def get_with_query_params(self, required_query_parameter: int, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1164,7 +1164,7 @@ def duplicate_params(self, filter: Optional[str] = None, **kwargs: Any) -> ItemP 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1239,7 +1239,7 @@ def page_with_max_page_size(self, maxpagesize: Literal["5"] = "5", **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1321,7 +1321,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1410,7 +1410,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1493,7 +1493,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1565,7 +1565,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged["_models.P 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1636,7 +1636,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Product" 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1707,7 +1707,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged["_models.Produc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1778,7 +1778,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged["_models.Pr 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1855,7 +1855,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1928,7 +1928,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2000,7 +2000,7 @@ def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2075,7 +2075,7 @@ def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2194,7 +2194,7 @@ def append_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2268,7 +2268,7 @@ def replace_api_version(self, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2343,7 +2343,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py index ec1c05d7b75..ef1f8f38fad 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -64,7 +64,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py index 15105073115..3b2be5534e0 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py index 857a2ff41f1..856382dca41 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import AutorestSecurityAadConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutorestSecurityAadOperationsMixin( @@ -49,7 +49,7 @@ async def head(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py index 8e995997217..8398f59f777 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -58,7 +58,7 @@ def head(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py index 4288845f81f..ceaf3ecc003 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -64,7 +64,7 @@ def __init__(self, credential: "TokenCredential", base_url: Optional[str] = None ] self._client: ARMPipelineClient = ARMPipelineClient(base_url=cast(str, base_url), policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py index f013e7d0d2e..b3d5db6cf36 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, Optional, TYPE_CHECKING, cast +from typing import Any, Awaitable, Optional, TYPE_CHECKING, cast from typing_extensions import Self from azure.core.pipeline import policies @@ -66,7 +66,7 @@ def __init__(self, credential: "AsyncTokenCredential", base_url: Optional[str] = base_url=cast(str, base_url), policies=_policies, **kwargs ) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py index df3e05efa0d..0a5d061ccc1 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import AutorestSecurityKeyConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutorestSecurityKeyOperationsMixin( @@ -49,7 +49,7 @@ async def head(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py index 8ba21eb546c..6d0e1523778 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -58,7 +58,7 @@ def head(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py index ad4907b93b4..e5a4ad09af5 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_storage_accounts_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -47,7 +47,7 @@ from .._configuration import StorageManagementClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class StorageAccountsOperations: @@ -130,7 +130,7 @@ async def check_name_availability( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -189,7 +189,7 @@ async def _create_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -404,7 +404,7 @@ async def delete(self, resource_group_name: str, account_name: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -461,7 +461,7 @@ async def get_properties( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -606,7 +606,7 @@ async def update( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -673,7 +673,7 @@ async def list_keys(self, resource_group_name: str, account_name: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -730,7 +730,7 @@ def list(self, **kwargs: Any) -> AsyncItemPaged["_models.StorageAccount"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -810,7 +810,7 @@ def list_by_resource_group( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -894,7 +894,7 @@ async def regenerate_key( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py index d2c937f7996..8ada579f24f 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/aio/operations/_usage_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import StorageManagementClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class UsageOperations: @@ -65,7 +65,7 @@ async def list(self, **kwargs: Any) -> _models.UsageListResult: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py index 61dd9ea825e..c28f347711c 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/models/_models_py3.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- import datetime -from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -217,7 +217,7 @@ class Resource(_serialization.Model): "tags": {"key": "tags", "type": "{str}"}, } - def __init__(self, *, location: str, tags: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: + def __init__(self, *, location: str, tags: Optional[dict[str, str]] = None, **kwargs: Any) -> None: """ :keyword location: Resource location. Required. :paramtype location: str @@ -316,7 +316,7 @@ def __init__( self, *, location: str, - tags: Optional[Dict[str, str]] = None, + tags: Optional[dict[str, str]] = None, provisioning_state: Optional[Union[str, "_models.ProvisioningState"]] = None, account_type: Optional[Union[str, "_models.AccountType"]] = None, primary_endpoints: Optional["_models.Endpoints"] = None, @@ -459,7 +459,7 @@ def __init__( self, *, location: str, - tags: Optional[Dict[str, str]] = None, + tags: Optional[dict[str, str]] = None, account_type: Optional[Union[str, "_models.AccountType"]] = None, **kwargs: Any ) -> None: @@ -518,7 +518,7 @@ class StorageAccountListResult(_serialization.Model): } def __init__( - self, *, value: Optional[List["_models.StorageAccount"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, value: Optional[list["_models.StorageAccount"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword value: Gets the list of storage accounts and their properties. @@ -601,7 +601,7 @@ def __init__( self, *, location: str, - tags: Optional[Dict[str, str]] = None, + tags: Optional[dict[str, str]] = None, account_type: Optional[Union[str, "_models.AccountType"]] = None, custom_domain: Optional["_models.CustomDomain"] = None, **kwargs: Any @@ -706,7 +706,7 @@ class UsageListResult(_serialization.Model): "value": {"key": "value", "type": "[Usage]"}, } - def __init__(self, *, value: Optional[List["_models.Usage"]] = None, **kwargs: Any) -> None: + def __init__(self, *, value: Optional[list["_models.Usage"]] = None, **kwargs: Any) -> None: """ :keyword value: Gets or sets the list Storage Resource Usages. :paramtype value: list[~storage.models.Usage] diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py index cd437c8bde7..97a733de1b8 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_storage_accounts_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -392,7 +392,7 @@ def check_name_availability( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -451,7 +451,7 @@ def _create_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -668,7 +668,7 @@ def delete( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -723,7 +723,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -868,7 +868,7 @@ def update( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -935,7 +935,7 @@ def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -992,7 +992,7 @@ def list(self, **kwargs: Any) -> ItemPaged["_models.StorageAccount"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1070,7 +1070,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1154,7 +1154,7 @@ def regenerate_key( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py index 0fb096d86b5..4cfc577083a 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/storage/operations/_usage_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -91,7 +91,7 @@ def list(self, **kwargs: Any) -> _models.UsageListResult: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_utils/serialization.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_utils/serialization.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py index cd56e146c9b..12af1c4bc1d 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/aio/operations/_group_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MicrosoftAzureTestUrlConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class GroupOperations: @@ -67,7 +67,7 @@ async def get_sample_resource_group(self, resource_group_name: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py index 5aa571d9bbe..fcf63937a1f 100644 --- a/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py +++ b/packages/autorest.python/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/subscriptionidapiversion/operations/_group_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -96,7 +96,7 @@ def get_sample_resource_group(self, resource_group_name: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py index 0b866955e48..37c205a7ded 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import AutoRestDurationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DurationOperations: @@ -69,7 +69,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def put_positive_duration(self, duration_body: datetime.timedelta, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -165,7 +165,7 @@ async def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py index fc23edc0362..eb6ad2b0717 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureBodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -127,7 +127,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -179,7 +179,7 @@ def put_positive_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -225,7 +225,7 @@ def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -273,7 +273,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/aio/operations/_operations.py index e512cff39c9..7a62d3df593 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import AutoRestParameterGroupingTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ParameterGroupingOperations: @@ -80,7 +80,7 @@ async def post_required( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -133,7 +133,7 @@ async def post_optional(self, *, custom_header: Optional[str] = None, query: int 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ async def post_reserved_words( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -243,7 +243,7 @@ async def post_multi_param_groups( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -294,7 +294,7 @@ async def post_shared_parameter_group_object( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -350,7 +350,7 @@ async def group_with_constant( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/operations/_operations.py index 3d889617e2a..acbf8a36c35 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureParameterGroupingVersionTolerant/azureparametergroupingversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -221,7 +221,7 @@ def post_required( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ def post_optional( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -327,7 +327,7 @@ def post_reserved_words( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -386,7 +386,7 @@ def post_multi_param_groups( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -437,7 +437,7 @@ def post_shared_parameter_group_object( # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -493,7 +493,7 @@ def group_with_constant( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_operations/_operations.py index 60167b699a7..2bf8459fd6e 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -59,7 +59,7 @@ class _AutoRestReportServiceForAzureOperationsMixin( ): @distributed_trace - def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :keyword qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' @@ -84,12 +84,12 @@ def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_auto_rest_report_service_for_azure_get_report_request( qualifier=qualifier, @@ -115,6 +115,6 @@ def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[ deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_operations/_operations.py index 37bd1621ada..55da0fbeb4c 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureReportVersionTolerant/azurereportversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestReportServiceForAzureConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestReportServiceForAzureOperationsMixin( @@ -35,7 +35,7 @@ class _AutoRestReportServiceForAzureOperationsMixin( ): @distributed_trace_async - async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :keyword qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' @@ -60,12 +60,12 @@ async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_auto_rest_report_service_for_azure_get_report_request( qualifier=qualifier, @@ -91,6 +91,6 @@ async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/aio/operations/_operations.py index 30d8a4056d8..925a4b2f7a6 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -60,7 +60,7 @@ from .._configuration import AutoRestAzureSpecialParametersTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class XMsClientRequestIdOperations: @@ -97,7 +97,7 @@ async def get(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ async def param_get(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -201,7 +201,7 @@ async def post_method_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -244,7 +244,7 @@ async def post_method_global_null(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -287,7 +287,7 @@ async def post_method_global_not_provided_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -331,7 +331,7 @@ async def post_path_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -374,7 +374,7 @@ async def post_swagger_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -440,7 +440,7 @@ async def post_method_local_valid(self, subscription_id: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -486,7 +486,7 @@ async def post_method_local_null(self, subscription_id: str, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -532,7 +532,7 @@ async def post_path_local_valid(self, subscription_id: str, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -578,7 +578,7 @@ async def post_swagger_local_valid(self, subscription_id: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -640,7 +640,7 @@ async def get_method_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -682,7 +682,7 @@ async def get_method_global_not_provided_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -724,7 +724,7 @@ async def get_path_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -766,7 +766,7 @@ async def get_swagger_global_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -828,7 +828,7 @@ async def get_method_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -874,7 +874,7 @@ async def get_method_local_null(self, *, api_version: Optional[str] = None, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -916,7 +916,7 @@ async def get_path_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -959,7 +959,7 @@ async def get_swagger_local_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1024,7 +1024,7 @@ async def get_method_path_valid(self, unencoded_path_param: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1068,7 +1068,7 @@ async def get_path_valid(self, unencoded_path_param: str, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1110,7 +1110,7 @@ async def get_swagger_path_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1155,7 +1155,7 @@ async def get_method_query_valid(self, *, q1: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1199,7 +1199,7 @@ async def get_method_query_null(self, *, q1: Optional[str] = None, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1243,7 +1243,7 @@ async def get_path_query_valid(self, *, q1: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1285,7 +1285,7 @@ async def get_swagger_query_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1357,7 +1357,7 @@ async def get_with_filter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1423,7 +1423,7 @@ async def custom_named_request_id(self, *, foo_client_request_id: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1471,7 +1471,7 @@ async def custom_named_request_id_param_grouping(self, *, foo_client_request_id: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1518,7 +1518,7 @@ async def custom_named_request_id_head(self, *, foo_client_request_id: str, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/operations/_operations.py index 8e13edf9b5a..f8b694a6190 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/azurespecialpropertiesversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -673,7 +673,7 @@ def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -715,7 +715,7 @@ def param_get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -777,7 +777,7 @@ def post_method_global_valid(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -820,7 +820,7 @@ def post_method_global_null(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -865,7 +865,7 @@ def post_method_global_not_provided_valid( # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -909,7 +909,7 @@ def post_path_global_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -952,7 +952,7 @@ def post_swagger_global_valid(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1020,7 +1020,7 @@ def post_method_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1068,7 +1068,7 @@ def post_method_local_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1116,7 +1116,7 @@ def post_path_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1164,7 +1164,7 @@ def post_swagger_local_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1226,7 +1226,7 @@ def get_method_global_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1270,7 +1270,7 @@ def get_method_global_not_provided_valid( # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1312,7 +1312,7 @@ def get_path_global_valid(self, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1354,7 +1354,7 @@ def get_swagger_global_valid(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1416,7 +1416,7 @@ def get_method_local_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1464,7 +1464,7 @@ def get_method_local_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1506,7 +1506,7 @@ def get_path_local_valid(self, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1549,7 +1549,7 @@ def get_swagger_local_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1616,7 +1616,7 @@ def get_method_path_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1662,7 +1662,7 @@ def get_path_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1704,7 +1704,7 @@ def get_swagger_path_valid(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1751,7 +1751,7 @@ def get_method_query_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1797,7 +1797,7 @@ def get_method_query_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1841,7 +1841,7 @@ def get_path_query_valid(self, *, q1: str, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1883,7 +1883,7 @@ def get_swagger_query_valid(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1955,7 +1955,7 @@ def get_with_filter( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2023,7 +2023,7 @@ def custom_named_request_id( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2073,7 +2073,7 @@ def custom_named_request_id_param_grouping( # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2120,7 +2120,7 @@ def custom_named_request_id_head(self, *, foo_client_request_id: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py index f22ba71db4f..49c3cc19e9f 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._configuration import AutoRestParameterizedHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: @@ -64,7 +64,7 @@ async def get_empty(self, account_name: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py index 0282f2803ce..4c6df4965a8 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -81,7 +81,7 @@ def get_empty(self, account_name: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/aio/operations/_operations.py index adab9057183..5975151024e 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Literal, Optional, TypeVar, Union, cast, overload import urllib.parse from custompollerpagerdefinitions.aio import AsyncCustomPager, AsyncCustomPoller @@ -67,7 +67,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: # pylint: disable=too-many-public-methods @@ -117,7 +117,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -199,7 +199,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -281,7 +281,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -363,7 +363,7 @@ def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -515,7 +515,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} content_type = content_type or "application/json" _json = None _content = None @@ -608,7 +608,7 @@ def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -698,7 +698,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -787,7 +787,7 @@ def get_with_query_params(self, *, required_query_parameter: int, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -869,7 +869,7 @@ def duplicate_params(self, *, filter: Optional[str] = None, **kwargs: Any) -> As 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -953,7 +953,7 @@ def page_with_max_page_size(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1044,7 +1044,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1138,7 +1138,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1224,7 +1224,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1307,7 +1307,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged[JSON] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1389,7 +1389,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1471,7 +1471,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1553,7 +1553,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1641,7 +1641,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1727,7 +1727,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1786,7 +1786,7 @@ async def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1863,7 +1863,7 @@ async def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1986,7 +1986,7 @@ def append_api_version(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2070,7 +2070,7 @@ def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2156,7 +2156,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/operations/_operations.py index 89422a09a76..e8537f3f3c7 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/custompollerpagerversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Literal, Optional, TypeVar, Union, cast, overload import urllib.parse from custompollerpagerdefinitions import CustomPager, CustomPoller @@ -38,7 +38,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -572,7 +572,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -654,7 +654,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -736,7 +736,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -818,7 +818,7 @@ def get_single_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -968,7 +968,7 @@ def get_single_pages_with_body_params(self, parameters: Union[JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} content_type = content_type or "application/json" _json = None _content = None @@ -1061,7 +1061,7 @@ def first_response_empty(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1151,7 +1151,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1240,7 +1240,7 @@ def get_with_query_params(self, *, required_query_parameter: int, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1322,7 +1322,7 @@ def duplicate_params(self, *, filter: Optional[str] = None, **kwargs: Any) -> It 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1406,7 +1406,7 @@ def page_with_max_page_size(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1497,7 +1497,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1591,7 +1591,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1677,7 +1677,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1760,7 +1760,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1842,7 +1842,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1924,7 +1924,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2006,7 +2006,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2092,7 +2092,7 @@ def get_multiple_pages_fragment_next_link(self, tenant: str, *, api_version: str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2178,7 +2178,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2237,7 +2237,7 @@ def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2313,7 +2313,7 @@ def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2436,7 +2436,7 @@ def append_api_version(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2520,7 +2520,7 @@ def replace_api_version(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2606,7 +2606,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/aio/operations/_operations.py index 332ffc43086..22954532d92 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -32,7 +32,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: @@ -87,7 +87,7 @@ def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> AsyncItemPa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -168,7 +168,7 @@ def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/operations/_operations.py index bcb5ec23b78..7f1c2d119c5 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/CustomUrlPagingVersionTolerant/custombaseurlpagingversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -135,7 +135,7 @@ def get_pages_partial_url(self, account_name: str, **kwargs: Any) -> ItemPaged[J 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -216,7 +216,7 @@ def get_pages_partial_url_operation(self, account_name: str, **kwargs: Any) -> I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/aio/operations/_operations.py index 819bf3414e9..906d4981455 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import AutoRestHeadExceptionTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeadExceptionOperations: @@ -67,7 +67,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -109,7 +109,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -151,7 +151,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/operations/_operations.py index 254f11214b6..298f4c49b1d 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/headexceptionsversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -128,7 +128,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -170,7 +170,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/aio/operations/_operations.py index 704d30f4fc3..89c1881c49b 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import AutoRestHeadTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -65,7 +65,7 @@ async def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -107,7 +107,7 @@ async def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -149,7 +149,7 @@ async def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/operations/_operations.py index 37f0229c496..5e564480c3f 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/headversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def head200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def head204(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ def head404(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/aio/operations/_operations.py index d248b717ad2..cd7d6bd9a09 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -39,7 +39,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QuestionAnsweringProjectsOperations: @@ -163,7 +163,7 @@ def get_qnas( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -222,7 +222,7 @@ async def get_next(next_link=None): return AsyncItemPaged(get_next, extract_data) async def _update_qnas_initial( - self, project_name: str, body: Union[List[JSON], IO[bytes]], **kwargs: Any + self, project_name: str, body: Union[list[JSON], IO[bytes]], **kwargs: Any ) -> AsyncIterator[bytes]: error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -230,7 +230,7 @@ async def _update_qnas_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -287,7 +287,7 @@ async def _update_qnas_initial( @overload async def begin_update_qnas( - self, project_name: str, body: List[JSON], *, content_type: str = "application/json", **kwargs: Any + self, project_name: str, body: list[JSON], *, content_type: str = "application/json", **kwargs: Any ) -> AsyncLROPoller[AsyncItemPaged[JSON]]: """Updates the QnAs of a project. @@ -496,7 +496,7 @@ async def begin_update_qnas( @distributed_trace_async async def begin_update_qnas( - self, project_name: str, body: Union[List[JSON], IO[bytes]], **kwargs: Any + self, project_name: str, body: Union[list[JSON], IO[bytes]], **kwargs: Any ) -> AsyncLROPoller[AsyncItemPaged[JSON]]: """Updates the QnAs of a project. @@ -588,7 +588,7 @@ async def begin_update_qnas( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} content_type = content_type or "application/json" _json = None _content = None diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/operations/_operations.py index 2826de1a9f5..015c12ad2b1 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroPagingVersionTolerant/lropagingversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -34,7 +34,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -230,7 +230,7 @@ def get_qnas( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -289,7 +289,7 @@ def get_next(next_link=None): return ItemPaged(get_next, extract_data) def _update_qnas_initial( - self, project_name: str, body: Union[List[JSON], IO[bytes]], **kwargs: Any + self, project_name: str, body: Union[list[JSON], IO[bytes]], **kwargs: Any ) -> Iterator[bytes]: error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -297,7 +297,7 @@ def _update_qnas_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -354,7 +354,7 @@ def _update_qnas_initial( @overload def begin_update_qnas( - self, project_name: str, body: List[JSON], *, content_type: str = "application/json", **kwargs: Any + self, project_name: str, body: list[JSON], *, content_type: str = "application/json", **kwargs: Any ) -> LROPoller[ItemPaged[JSON]]: """Updates the QnAs of a project. @@ -563,7 +563,7 @@ def begin_update_qnas( @distributed_trace def begin_update_qnas( - self, project_name: str, body: Union[List[JSON], IO[bytes]], **kwargs: Any + self, project_name: str, body: Union[list[JSON], IO[bytes]], **kwargs: Any ) -> LROPoller[ItemPaged[JSON]]: """Updates the QnAs of a project. @@ -655,7 +655,7 @@ def begin_update_qnas( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} content_type = content_type or "application/json" _json = None _content = None diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/aio/operations/_operations.py index 95357731d62..1e35131d263 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -117,7 +117,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class LROsOperations: # pylint: disable=too-many-public-methods @@ -148,7 +148,7 @@ async def _put200_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -384,7 +384,7 @@ async def _patch200_succeeded_ignore_headers_initial( # pylint: disable=name-to 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -630,7 +630,7 @@ async def _patch201_retry_with_async_header_initial( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -869,7 +869,7 @@ async def _patch202_retry_with_async_and_location_header_initial( # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1112,7 +1112,7 @@ async def _put201_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1346,7 +1346,7 @@ async def _post202_list_initial(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1389,7 +1389,7 @@ async def _post202_list_initial(self, **kwargs: Any) -> AsyncIterator[bytes]: return cast(AsyncIterator[bytes], deserialized) # type: ignore @distributed_trace_async - async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[List[JSON]]: + async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[list[JSON]]: """Long running put request, service returns a 202 with empty body to first request, returns a 200 with body [{ 'id': '100', 'name': 'foo' }]. @@ -1420,7 +1420,7 @@ async def begin_post202_list(self, **kwargs: Any) -> AsyncLROPoller[List[JSON]]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -1448,13 +1448,13 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return AsyncLROPoller[List[JSON]].from_continuation_token( + return AsyncLROPoller[list[JSON]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return AsyncLROPoller[List[JSON]]( + return AsyncLROPoller[list[JSON]]( self._client, raw_result, get_long_running_output, polling_method # type: ignore ) @@ -1467,7 +1467,7 @@ async def _put200_succeeded_no_state_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1703,7 +1703,7 @@ async def _put202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1942,7 +1942,7 @@ async def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2181,7 +2181,7 @@ async def _put200_updating_succeeded204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2420,7 +2420,7 @@ async def _put201_creating_failed200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2659,7 +2659,7 @@ async def _put200_acceptedcanceled200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2898,7 +2898,7 @@ async def _put_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3140,7 +3140,7 @@ async def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3393,7 +3393,7 @@ async def _put_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3644,7 +3644,7 @@ async def _put_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3897,7 +3897,7 @@ async def _put_async_no_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4148,7 +4148,7 @@ async def _put_async_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4397,7 +4397,7 @@ async def _put_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4579,7 +4579,7 @@ async def _put_async_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4761,7 +4761,7 @@ async def _put_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4964,7 +4964,7 @@ async def _put_async_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5167,7 +5167,7 @@ async def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5285,7 +5285,7 @@ async def _delete_provisioning202_deleting_failed200_initial( # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5403,7 +5403,7 @@ async def _delete_provisioning202_deletingcanceled200_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5519,7 +5519,7 @@ async def _delete204_succeeded_initial(self, **kwargs: Any) -> AsyncIterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5602,7 +5602,7 @@ async def _delete202_retry200_initial(self, **kwargs: Any) -> AsyncIterator[byte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5715,7 +5715,7 @@ async def _delete202_no_retry204_initial(self, **kwargs: Any) -> AsyncIterator[b 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5828,7 +5828,7 @@ async def _delete_no_header_in_retry_initial(self, **kwargs: Any) -> AsyncIterat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5916,7 +5916,7 @@ async def _delete_async_no_header_in_retry_initial(self, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6004,7 +6004,7 @@ async def _delete_async_retry_succeeded_initial(self, **kwargs: Any) -> AsyncIte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6095,7 +6095,7 @@ async def _delete_async_no_retry_succeeded_initial(self, **kwargs: Any) -> Async 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6186,7 +6186,7 @@ async def _delete_async_retry_failed_initial(self, **kwargs: Any) -> AsyncIterat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6277,7 +6277,7 @@ async def _delete_async_retrycanceled_initial(self, **kwargs: Any) -> AsyncItera 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6368,7 +6368,7 @@ async def _post200_with_payload_initial(self, **kwargs: Any) -> AsyncIterator[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6469,7 +6469,7 @@ async def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6655,7 +6655,7 @@ async def _post202_no_retry204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6899,7 +6899,7 @@ async def _post_double_headers_final_location_get_initial( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7014,7 +7014,7 @@ async def _post_double_headers_final_azure_header_get_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7130,7 +7130,7 @@ async def _post_double_headers_final_azure_header_get_default_initial( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7243,7 +7243,7 @@ async def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -7490,7 +7490,7 @@ async def _post_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -7737,7 +7737,7 @@ async def _post_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -7929,7 +7929,7 @@ async def _post_async_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -8141,7 +8141,7 @@ async def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -8380,7 +8380,7 @@ async def _put_async_relative_retry_succeeded_initial( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -8633,7 +8633,7 @@ async def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -8749,7 +8749,7 @@ async def _delete202_retry200_initial(self, **kwargs: Any) -> AsyncIterator[byte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -8839,7 +8839,7 @@ async def _delete_async_relative_retry_succeeded_initial( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -8934,7 +8934,7 @@ async def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9120,7 +9120,7 @@ async def _post_async_relative_retry_succeeded_initial( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9332,7 +9332,7 @@ async def _put_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9565,7 +9565,7 @@ async def _put_non_retry201_creating400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9801,7 +9801,7 @@ async def _put_non_retry201_creating400_invalid_json_initial( # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10037,7 +10037,7 @@ async def _put_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10285,7 +10285,7 @@ async def _delete_non_retry400_initial(self, **kwargs: Any) -> AsyncIterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -10372,7 +10372,7 @@ async def _delete202_non_retry400_initial(self, **kwargs: Any) -> AsyncIterator[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -10459,7 +10459,7 @@ async def _delete_async_relative_retry400_initial(self, **kwargs: Any) -> AsyncI 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -10552,7 +10552,7 @@ async def _post_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10735,7 +10735,7 @@ async def _post202_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10918,7 +10918,7 @@ async def _post_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11107,7 +11107,7 @@ async def _put_error201_no_provisioning_state_payload_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11340,7 +11340,7 @@ async def _put_async_relative_retry_no_status_initial( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11593,7 +11593,7 @@ async def _put_async_relative_retry_no_status_payload_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11844,7 +11844,7 @@ async def _delete204_succeeded_initial(self, **kwargs: Any) -> AsyncIterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -11929,7 +11929,7 @@ async def _delete_async_relative_retry_no_status_initial( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -12024,7 +12024,7 @@ async def _post202_no_location_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12210,7 +12210,7 @@ async def _post_async_relative_retry_no_payload_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12402,7 +12402,7 @@ async def _put200_invalid_json_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12638,7 +12638,7 @@ async def _put_async_relative_retry_invalid_header_initial( # pylint: disable=n 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12891,7 +12891,7 @@ async def _put_async_relative_retry_invalid_json_polling_initial( # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13142,7 +13142,7 @@ async def _delete202_retry_invalid_header_initial(self, **kwargs: Any) -> AsyncI 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -13232,7 +13232,7 @@ async def _delete_async_relative_retry_invalid_header_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -13327,7 +13327,7 @@ async def _delete_async_relative_retry_invalid_json_polling_initial( # pylint: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -13422,7 +13422,7 @@ async def _post202_retry_invalid_header_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13608,7 +13608,7 @@ async def _post_async_relative_retry_invalid_header_initial( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13800,7 +13800,7 @@ async def _post_async_relative_retry_invalid_json_polling_initial( # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14012,7 +14012,7 @@ async def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14268,7 +14268,7 @@ async def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14510,7 +14510,7 @@ async def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14699,7 +14699,7 @@ async def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/operations/_operations.py index 0734c5b9745..8d1e19539c2 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/lroversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1415,7 +1415,7 @@ def _put200_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1651,7 +1651,7 @@ def _patch200_succeeded_ignore_headers_initial( # pylint: disable=name-too-long 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1897,7 +1897,7 @@ def _patch201_retry_with_async_header_initial( # pylint: disable=name-too-long 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2136,7 +2136,7 @@ def _patch202_retry_with_async_and_location_header_initial( # pylint: disable=n 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2379,7 +2379,7 @@ def _put201_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2613,7 +2613,7 @@ def _post202_list_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2656,7 +2656,7 @@ def _post202_list_initial(self, **kwargs: Any) -> Iterator[bytes]: return cast(Iterator[bytes], deserialized) # type: ignore @distributed_trace - def begin_post202_list(self, **kwargs: Any) -> LROPoller[List[JSON]]: + def begin_post202_list(self, **kwargs: Any) -> LROPoller[list[JSON]]: """Long running put request, service returns a 202 with empty body to first request, returns a 200 with body [{ 'id': '100', 'name': 'foo' }]. @@ -2687,7 +2687,7 @@ def begin_post202_list(self, **kwargs: Any) -> LROPoller[List[JSON]]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) cont_token: Optional[str] = kwargs.pop("continuation_token", None) @@ -2713,13 +2713,13 @@ def get_long_running_output(pipeline_response): else: polling_method = polling if cont_token: - return LROPoller[List[JSON]].from_continuation_token( + return LROPoller[list[JSON]].from_continuation_token( polling_method=polling_method, continuation_token=cont_token, client=self._client, deserialization_callback=get_long_running_output, ) - return LROPoller[List[JSON]](self._client, raw_result, get_long_running_output, polling_method) # type: ignore + return LROPoller[list[JSON]](self._client, raw_result, get_long_running_output, polling_method) # type: ignore def _put200_succeeded_no_state_initial( self, product: Optional[Union[JSON, IO[bytes]]] = None, **kwargs: Any @@ -2730,7 +2730,7 @@ def _put200_succeeded_no_state_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2966,7 +2966,7 @@ def _put202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3203,7 +3203,7 @@ def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3442,7 +3442,7 @@ def _put200_updating_succeeded204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3681,7 +3681,7 @@ def _put201_creating_failed200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3920,7 +3920,7 @@ def _put200_acceptedcanceled200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4159,7 +4159,7 @@ def _put_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4401,7 +4401,7 @@ def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4654,7 +4654,7 @@ def _put_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4905,7 +4905,7 @@ def _put_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5158,7 +5158,7 @@ def _put_async_no_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5409,7 +5409,7 @@ def _put_async_no_header_in_retry_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5656,7 +5656,7 @@ def _put_non_resource_initial(self, sku: Optional[Union[JSON, IO[bytes]]] = None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5836,7 +5836,7 @@ def _put_async_non_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6018,7 +6018,7 @@ def _put_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6221,7 +6221,7 @@ def _put_async_sub_resource_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6424,7 +6424,7 @@ def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6542,7 +6542,7 @@ def _delete_provisioning202_deleting_failed200_initial( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6660,7 +6660,7 @@ def _delete_provisioning202_deletingcanceled200_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6776,7 +6776,7 @@ def _delete204_succeeded_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6859,7 +6859,7 @@ def _delete202_retry200_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6972,7 +6972,7 @@ def _delete202_no_retry204_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7085,7 +7085,7 @@ def _delete_no_header_in_retry_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7173,7 +7173,7 @@ def _delete_async_no_header_in_retry_initial(self, **kwargs: Any) -> Iterator[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7261,7 +7261,7 @@ def _delete_async_retry_succeeded_initial(self, **kwargs: Any) -> Iterator[bytes 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7352,7 +7352,7 @@ def _delete_async_no_retry_succeeded_initial(self, **kwargs: Any) -> Iterator[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7443,7 +7443,7 @@ def _delete_async_retry_failed_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7534,7 +7534,7 @@ def _delete_async_retrycanceled_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7625,7 +7625,7 @@ def _post200_with_payload_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7726,7 +7726,7 @@ def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -7912,7 +7912,7 @@ def _post202_no_retry204_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -8156,7 +8156,7 @@ def _post_double_headers_final_location_get_initial( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -8271,7 +8271,7 @@ def _post_double_headers_final_azure_header_get_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -8386,7 +8386,7 @@ def _post_double_headers_final_azure_header_get_default_initial( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -8499,7 +8499,7 @@ def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -8746,7 +8746,7 @@ def _post_async_no_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -8993,7 +8993,7 @@ def _post_async_retry_failed_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9185,7 +9185,7 @@ def _post_async_retrycanceled_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9397,7 +9397,7 @@ def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9636,7 +9636,7 @@ def _put_async_relative_retry_succeeded_initial( # pylint: disable=name-too-lon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -9889,7 +9889,7 @@ def _delete_provisioning202_accepted200_succeeded_initial( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -10005,7 +10005,7 @@ def _delete202_retry200_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -10095,7 +10095,7 @@ def _delete_async_relative_retry_succeeded_initial( # pylint: disable=name-too- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -10190,7 +10190,7 @@ def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10376,7 +10376,7 @@ def _post_async_relative_retry_succeeded_initial( # pylint: disable=name-too-lo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10588,7 +10588,7 @@ def _put_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -10821,7 +10821,7 @@ def _put_non_retry201_creating400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11057,7 +11057,7 @@ def _put_non_retry201_creating400_invalid_json_initial( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11293,7 +11293,7 @@ def _put_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11541,7 +11541,7 @@ def _delete_non_retry400_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -11628,7 +11628,7 @@ def _delete202_non_retry400_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -11715,7 +11715,7 @@ def _delete_async_relative_retry400_initial(self, **kwargs: Any) -> Iterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -11808,7 +11808,7 @@ def _post_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -11991,7 +11991,7 @@ def _post202_non_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12174,7 +12174,7 @@ def _post_async_relative_retry400_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12363,7 +12363,7 @@ def _put_error201_no_provisioning_state_payload_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12596,7 +12596,7 @@ def _put_async_relative_retry_no_status_initial( # pylint: disable=name-too-lon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -12849,7 +12849,7 @@ def _put_async_relative_retry_no_status_payload_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13100,7 +13100,7 @@ def _delete204_succeeded_initial(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -13185,7 +13185,7 @@ def _delete_async_relative_retry_no_status_initial( # pylint: disable=name-too- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -13280,7 +13280,7 @@ def _post202_no_location_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13466,7 +13466,7 @@ def _post_async_relative_retry_no_payload_initial( # pylint: disable=name-too-l 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13658,7 +13658,7 @@ def _put200_invalid_json_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -13894,7 +13894,7 @@ def _put_async_relative_retry_invalid_header_initial( # pylint: disable=name-to 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14147,7 +14147,7 @@ def _put_async_relative_retry_invalid_json_polling_initial( # pylint: disable=n 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14398,7 +14398,7 @@ def _delete202_retry_invalid_header_initial(self, **kwargs: Any) -> Iterator[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -14488,7 +14488,7 @@ def _delete_async_relative_retry_invalid_header_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -14583,7 +14583,7 @@ def _delete_async_relative_retry_invalid_json_polling_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -14678,7 +14678,7 @@ def _post202_retry_invalid_header_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -14864,7 +14864,7 @@ def _post_async_relative_retry_invalid_header_initial( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -15056,7 +15056,7 @@ def _post_async_relative_retry_invalid_json_polling_initial( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -15268,7 +15268,7 @@ def _put_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -15524,7 +15524,7 @@ def _put201_creating_succeeded200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -15766,7 +15766,7 @@ def _post202_retry200_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -15955,7 +15955,7 @@ def _post_async_retry_succeeded_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_operations/_operations.py index 73515da4e57..d030b3f7bee 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Literal, Optional, TypeVar, Union, cast +from typing import Any, Callable, Iterator, Literal, Optional, TypeVar, Union, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -89,7 +89,7 @@ def _poll_with_parameterized_endpoints_initial( # pylint: disable=name-too-long 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -203,7 +203,7 @@ def _poll_with_constant_parameterized_endpoints_initial( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_operations/_operations.py index a00e3f0525a..2b79722ebc0 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/LroWithParameterizedEndpointsVersionTolerant/lrowithparameterizedendpointsversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Literal, Optional, TypeVar, Union, cast +from typing import Any, AsyncIterator, Callable, Literal, Optional, TypeVar, Union, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import LROWithParamaterizedEndpointsConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _LROWithParamaterizedEndpointsOperationsMixin( @@ -50,7 +50,7 @@ async def _poll_with_parameterized_endpoints_initial( # pylint: disable=name-to 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -164,7 +164,7 @@ async def _poll_with_constant_parameterized_endpoints_initial( # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/aio/operations/_operations.py index 05496c980be..6c9d409ee47 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Literal, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -64,7 +64,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PagingOperations: # pylint: disable=too-many-public-methods @@ -114,7 +114,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -196,7 +196,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -278,7 +278,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -360,7 +360,7 @@ def get_single_pages(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -512,7 +512,7 @@ def get_single_pages_with_body_params( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} content_type = content_type or "application/json" _json = None _content = None @@ -605,7 +605,7 @@ def first_response_empty(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -695,7 +695,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -784,7 +784,7 @@ def get_with_query_params(self, *, required_query_parameter: int, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -866,7 +866,7 @@ def duplicate_params(self, *, filter: Optional[str] = None, **kwargs: Any) -> As 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -950,7 +950,7 @@ def page_with_max_page_size(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1041,7 +1041,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1135,7 +1135,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1221,7 +1221,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1304,7 +1304,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> AsyncItemPaged[JSON] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1386,7 +1386,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1468,7 +1468,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1550,7 +1550,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1638,7 +1638,7 @@ def get_multiple_pages_fragment_next_link( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1724,7 +1724,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1783,7 +1783,7 @@ async def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1859,7 +1859,7 @@ async def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1982,7 +1982,7 @@ def append_api_version(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2066,7 +2066,7 @@ def replace_api_version(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2152,7 +2152,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/operations/_operations.py index f6fd675c862..23db4085559 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/PagingVersionTolerant/pagingversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Literal, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -35,7 +35,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -569,7 +569,7 @@ def get_no_item_name_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -651,7 +651,7 @@ def get_empty_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -733,7 +733,7 @@ def get_null_next_link_name_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -815,7 +815,7 @@ def get_single_pages(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -965,7 +965,7 @@ def get_single_pages_with_body_params(self, parameters: Union[JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} content_type = content_type or "application/json" _json = None _content = None @@ -1058,7 +1058,7 @@ def first_response_empty(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1148,7 +1148,7 @@ def get_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1237,7 +1237,7 @@ def get_with_query_params(self, *, required_query_parameter: int, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1319,7 +1319,7 @@ def duplicate_params(self, *, filter: Optional[str] = None, **kwargs: Any) -> It 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1403,7 +1403,7 @@ def page_with_max_page_size(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1494,7 +1494,7 @@ def get_odata_multiple_pages( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1588,7 +1588,7 @@ def get_multiple_pages_with_offset( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1674,7 +1674,7 @@ def get_multiple_pages_retry_first(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1757,7 +1757,7 @@ def get_multiple_pages_retry_second(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1839,7 +1839,7 @@ def get_single_pages_failure(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1921,7 +1921,7 @@ def get_multiple_pages_failure(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2003,7 +2003,7 @@ def get_multiple_pages_failure_uri(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2089,7 +2089,7 @@ def get_multiple_pages_fragment_next_link(self, tenant: str, *, api_version: str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2175,7 +2175,7 @@ def get_multiple_pages_fragment_with_grouping_next_link( # pylint: disable=name 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2234,7 +2234,7 @@ def _get_multiple_pages_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2310,7 +2310,7 @@ def begin_get_multiple_pages_lro( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2433,7 +2433,7 @@ def append_api_version(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2517,7 +2517,7 @@ def replace_api_version(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -2603,7 +2603,7 @@ def get_paging_model_with_item_name_with_xms_client_name( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/aio/operations/_operations.py index 1e7661a46b8..749474e8270 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -49,7 +49,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class StorageAccountsOperations: @@ -165,7 +165,7 @@ async def check_name_availability(self, account_name: Union[JSON, IO[bytes]], ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -222,7 +222,7 @@ async def _create_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -606,7 +606,7 @@ async def delete(self, resource_group_name: str, account_name: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -710,7 +710,7 @@ async def get_properties(self, resource_group_name: str, account_name: str, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1038,7 +1038,7 @@ async def update( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1116,7 +1116,7 @@ async def list_keys(self, resource_group_name: str, account_name: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1224,7 +1224,7 @@ def list(self, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1351,7 +1351,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1527,7 +1527,7 @@ async def regenerate_key( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1627,7 +1627,7 @@ async def list(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/operations/_operations.py index 7b3b7b4ea34..92d9f73d6f6 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/storageversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -432,7 +432,7 @@ def check_name_availability(self, account_name: Union[JSON, IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -489,7 +489,7 @@ def _create_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -875,7 +875,7 @@ def delete( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -979,7 +979,7 @@ def get_properties(self, resource_group_name: str, account_name: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1307,7 +1307,7 @@ def update( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1385,7 +1385,7 @@ def list_keys(self, resource_group_name: str, account_name: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1493,7 +1493,7 @@ def list(self, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1620,7 +1620,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -1796,7 +1796,7 @@ def regenerate_key( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1896,7 +1896,7 @@ def list(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/_utils/serialization.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/aio/operations/_operations.py index 53aeb7da208..199c0ae48ff 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class GroupOperations: @@ -73,7 +73,7 @@ async def get_sample_resource_group(self, resource_group_name: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/operations/_operations.py b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/operations/_operations.py index 7b6802c6773..f2e29769195 100644 --- a/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/subscriptionidapiversionversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -103,7 +103,7 @@ def get_sample_resource_group(self, resource_group_name: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_operations/_operations.py index d59a7905618..4601e518e38 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def get_model(self, mode: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -277,7 +277,7 @@ def post_model(self, mode: str, input: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -356,7 +356,7 @@ def get_pages(self, mode: str, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -405,7 +405,7 @@ def _lro_initial(self, mode: str, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_utils/serialization.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_operations/_operations.py index b37ee5c8a8e..ad6bb4a636a 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationCustomizedVersionTolerant/dpgcustomizationcustomizedversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -41,7 +41,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _DPGClientOperationsMixin( @@ -75,7 +75,7 @@ async def get_model(self, mode: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -208,7 +208,7 @@ async def post_model(self, mode: str, input: Union[JSON, IO[bytes]], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -287,7 +287,7 @@ def get_pages(self, mode: str, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -336,7 +336,7 @@ async def _lro_initial(self, mode: str, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_operations/_operations.py index d59a7905618..4601e518e38 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def get_model(self, mode: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -277,7 +277,7 @@ def post_model(self, mode: str, input: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -356,7 +356,7 @@ def get_pages(self, mode: str, **kwargs: Any) -> ItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -405,7 +405,7 @@ def _lro_initial(self, mode: str, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_utils/serialization.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_operations/_operations.py index b37ee5c8a8e..ad6bb4a636a 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGCustomizationInitialVersionTolerant/dpgcustomizationinitialversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -41,7 +41,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _DPGClientOperationsMixin( @@ -75,7 +75,7 @@ async def get_model(self, mode: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -208,7 +208,7 @@ async def post_model(self, mode: str, input: Union[JSON, IO[bytes]], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -287,7 +287,7 @@ def get_pages(self, mode: str, **kwargs: Any) -> AsyncItemPaged[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -336,7 +336,7 @@ async def _lro_initial(self, mode: str, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/_utils/serialization.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/aio/operations/_operations.py index 6b5f32986ce..f83ff498f2a 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ParamsOperations: @@ -70,7 +70,7 @@ async def head_no_params(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -122,7 +122,7 @@ async def get_required(self, *, parameter: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -178,7 +178,7 @@ async def put_required_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -279,7 +279,7 @@ async def post_parameters(self, parameter: Union[JSON, IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -343,7 +343,7 @@ async def get_optional(self, *, optional_param: Optional[str] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/operations/_operations.py index 7b1f12aceaf..b1282e14091 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenInitialVersionTolerant/dpgservicedriveninitialversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -156,7 +156,7 @@ def head_no_params(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -208,7 +208,7 @@ def get_required(self, *, parameter: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -264,7 +264,7 @@ def put_required_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -363,7 +363,7 @@ def post_parameters(self, parameter: Union[JSON, IO[bytes]], **kwargs: Any) -> J 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -427,7 +427,7 @@ def get_optional(self, *, optional_param: Optional[str] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/_utils/serialization.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/aio/operations/_operations.py index 482dab3b2a3..54b3fa58a08 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -37,7 +37,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ParamsOperations: @@ -74,7 +74,7 @@ async def head_no_params(self, *, new_parameter: Optional[str] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -129,7 +129,7 @@ async def get_required(self, *, parameter: str, new_parameter: Optional[str] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -193,7 +193,7 @@ async def put_required_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -293,7 +293,7 @@ async def post_parameters(self, parameter: Union[JSON, IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -360,7 +360,7 @@ async def delete_parameters(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -409,7 +409,7 @@ async def get_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -461,7 +461,7 @@ async def get_new_operation(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/operations/_operations.py index 6447c3de1a7..64e110fb937 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGServiceDrivenUpdateOneVersionTolerant/dpgservicedrivenupdateoneversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -194,7 +194,7 @@ def head_no_params(self, *, new_parameter: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -249,7 +249,7 @@ def get_required(self, *, parameter: str, new_parameter: Optional[str] = None, * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -313,7 +313,7 @@ def put_required_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -413,7 +413,7 @@ def post_parameters(self, parameter: Union[JSON, IO[bytes]], **kwargs: Any) -> J 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -480,7 +480,7 @@ def delete_parameters(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -529,7 +529,7 @@ def get_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -581,7 +581,7 @@ def get_new_operation(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_client.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_client.py index 95522248fcf..49431f569f5 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_client.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_client.py @@ -54,7 +54,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential self._client: PipelineClient = PipelineClient(base_url=endpoint, policies=_policies, **kwargs) client_models = {k: v for k, v in _models._models.__dict__.items() if isinstance(v, type)} - client_models.update({k: v for k, v in _models.__dict__.items() if isinstance(v, type)}) + client_models |= {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py index d72a21bab19..3bdf7deeec9 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -140,7 +140,7 @@ def get_model(self, mode: str, **kwargs: Any) -> _models.Product: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -236,7 +236,7 @@ def post_model(self, mode: str, input: Union[_models.Input, IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -304,7 +304,7 @@ def get_pages(self, mode: str, **kwargs: Any) -> ItemPaged["_models.Product"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -355,7 +355,7 @@ def _lro_initial(self, mode: str, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_client.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_client.py index bf4e449218e..92c68907e4e 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_client.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_client.py @@ -54,7 +54,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=endpoint, policies=_policies, **kwargs) client_models = {k: v for k, v in _models._models.__dict__.items() if isinstance(v, type)} - client_models.update({k: v for k, v in _models.__dict__.items() if isinstance(v, type)}) + client_models |= {k: v for k, v in _models.__dict__.items() if isinstance(v, type)} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py index 41e5ffb5350..d0523cf4c66 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -41,7 +41,7 @@ from .._configuration import DPGClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _DPGClientOperationsMixin( @@ -67,7 +67,7 @@ async def get_model(self, mode: str, **kwargs: Any) -> _models.Product: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def post_model(self, mode: str, input: Union[_models.Input, IO[bytes]], ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ def get_pages(self, mode: str, **kwargs: Any) -> AsyncItemPaged["_models.Product 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -282,7 +282,7 @@ async def _lro_initial(self, mode: str, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models.py b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models.py index b17741edd0c..41b98b4d32c 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models.py +++ b/packages/autorest.python/test/dpg/version-tolerant/Expected/AcceptanceTests/DPGTestModelsVersionTolerant/dpgtestmodelsversiontolerant/models/_models.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -115,7 +115,7 @@ class ProductResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/aio/operations/_operation_group_one_operations.py index 75ce9a0d60a..8410c90f2e4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -66,7 +66,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/models/_models_py3.py index 6e2a859e193..28088dad32c 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/operations/_operation_group_one_operations.py index 672f67d7d85..c2ccbc80340 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v0/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py index f62d1ee5f99..78d0bbe1fa7 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -43,7 +43,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -73,7 +73,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -116,7 +116,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -461,7 +461,7 @@ async def test_different_calls(self, greeting_in_english: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_operation_group_one_operations.py index 6ef6155be1d..316e2f26709 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -66,7 +66,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/models/_models_py3.py index d0122abf511..0ab6b2d885f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py index 46ae34565ab..2f83820727c 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -152,7 +152,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -195,7 +195,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -423,7 +423,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -539,7 +539,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_operation_group_one_operations.py index 336a26cf3a0..75123275f1a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py index 8ad132c6d9e..a2a22254cbc 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -60,7 +60,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -118,7 +118,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py index 84c3d3841b7..84987834de1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -104,7 +104,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -167,7 +167,7 @@ async def test_three(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_two_operations.py index 179599b9f42..8b1f1a15b38 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/aio/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -68,7 +68,7 @@ async def test_four(self, parameter_one: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py index f74c2f36fd9..1e71c21497a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> _mo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py index 2cb6597698e..00ad193a75f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -210,7 +210,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_two_operations.py index f03a0a1b7e8..058f519c0b6 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -90,7 +90,7 @@ def test_four(self, parameter_one: bool, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py index 2220a85bc50..1eee87f17ef 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -67,7 +67,7 @@ def test_paging(self, **kwargs: Any) -> AsyncItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -145,7 +145,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py index 40f3818e5ee..ccc3979d9ef 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -78,7 +78,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> AsyncItemPaged["_models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -185,7 +185,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py index b107fe873a8..757015ac6e3 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/aio/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -103,7 +103,7 @@ async def test_four(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -162,7 +162,7 @@ async def test_five(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_models_py3.py index 8b85d248505..6f2148fe3f3 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py index 333abf6b245..0c60e55a2a6 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -109,7 +109,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -187,7 +187,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py index d929f8bf2d6..15639246b7b 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -112,7 +112,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -219,7 +219,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py index 557679c50c9..b07c29e939a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -207,7 +207,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py index 6038b3223f9..bc52db5c770 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -43,7 +43,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -73,7 +73,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -116,7 +116,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -348,7 +348,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -462,7 +462,7 @@ async def test_different_calls(self, greeting_in_english: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_operation_group_one_operations.py index d02864e2d8e..546defe6703 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -66,7 +66,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py index 95e9ce2e471..d7c87fd8fb9 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py index 0e903fbf358..912cb3ed156 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -152,7 +152,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -195,7 +195,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -540,7 +540,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py index 4a70e11a52e..b2d3fd35b9d 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py index 14c9a02a560..d0f9444261f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -60,7 +60,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -118,7 +118,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py index 89976bf3ea7..d00cf87d541 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -104,7 +104,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -167,7 +167,7 @@ async def test_three(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_two_operations.py index f86912ce017..e9d1072a51b 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/aio/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -68,7 +68,7 @@ async def test_four(self, parameter_one: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py index f1c9b356679..804fd49a4cb 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> _mo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py index cd4d63afc93..c6d551260e2 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -210,7 +210,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py index 0583563c8e9..e72b6a4c1cd 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -90,7 +90,7 @@ def test_four(self, parameter_one: bool, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py index bd6949a090d..f207c248045 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -68,7 +68,7 @@ def test_paging(self, **kwargs: Any) -> AsyncItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -146,7 +146,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py index e7acc80c0cf..4f41985c8ff 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -79,7 +79,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> AsyncItemPaged["_models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -186,7 +186,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py index 242761a2b61..ee9c71571c9 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/aio/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -103,7 +103,7 @@ async def test_four(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -162,7 +162,7 @@ async def test_five(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py index 28c7bea759a..6d2f9c9fd67 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py index fd547820ca5..16dd85b9b74 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -109,7 +109,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -187,7 +187,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py index 4de630b1cbc..73f142cf880 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -112,7 +112,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -219,7 +219,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py index adbd04a93a0..768adee763e 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -207,7 +207,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/_multiapi_custom_base_url_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/_multiapi_custom_base_url_service_client_operations.py index 3927324a634..1fd2c891c70 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/_multiapi_custom_base_url_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/aio/operations/_multiapi_custom_base_url_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiCustomBaseUrlServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiCustomBaseUrlServiceClientOperationsMixin( # pylint: disable=name-too-long @@ -58,7 +58,7 @@ async def test(self, id: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/operations/_multiapi_custom_base_url_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/operations/_multiapi_custom_base_url_service_client_operations.py index ef33dcc2922..1701afa21e5 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/operations/_multiapi_custom_base_url_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/operations/_multiapi_custom_base_url_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -80,7 +80,7 @@ def test(self, id: int, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/_multiapi_custom_base_url_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/_multiapi_custom_base_url_service_client_operations.py index f9d8101f893..d8e67b4e549 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/_multiapi_custom_base_url_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/aio/operations/_multiapi_custom_base_url_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiCustomBaseUrlServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiCustomBaseUrlServiceClientOperationsMixin( # pylint: disable=name-too-long @@ -58,7 +58,7 @@ async def test(self, id: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/operations/_multiapi_custom_base_url_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/operations/_multiapi_custom_base_url_service_client_operations.py index 25cfe1ae31b..50cfac7c5d1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/operations/_multiapi_custom_base_url_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/operations/_multiapi_custom_base_url_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -80,7 +80,7 @@ def test(self, id: int, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py index 78dabac6679..af17ce9a3a9 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -42,7 +42,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -72,7 +72,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -115,7 +115,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -270,7 +270,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -346,7 +346,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -460,7 +460,7 @@ async def test_different_calls(self, greeting_in_english: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_operation_group_one_operations.py index 6e85a1463fa..b404c4a04b1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -65,7 +65,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/models/_models_py3.py index e51da879214..8272db813a8 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py index 515829ea494..ee1c210c541 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -35,7 +35,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -151,7 +151,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -194,7 +194,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -346,7 +346,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -422,7 +422,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -538,7 +538,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_operation_group_one_operations.py index 09b4bb1fb09..bd025ef26cd 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py index eca173718d7..cc654231fb2 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -59,7 +59,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -117,7 +117,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py index 37b3540d142..807ac5d88a4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -103,7 +103,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ async def test_three(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_two_operations.py index 0eac39118b5..21e2b21a7da 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/aio/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -67,7 +67,7 @@ async def test_four(self, parameter_one: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py index 28051f16b8e..344940d9748 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -107,7 +107,7 @@ def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> _mo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -165,7 +165,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py index db52e2cabf8..b6563dfa888 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -146,7 +146,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -209,7 +209,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_two_operations.py index 44925122208..32c7b5f6f76 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -89,7 +89,7 @@ def test_four(self, parameter_one: bool, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py index 8ba241fd8e7..8b80ed6b62a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import AsyncPipelineClient @@ -35,7 +35,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -66,7 +66,7 @@ def test_paging(self, **kwargs: Any) -> AsyncItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -144,7 +144,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py index 4810e0d7a88..2985401a4d2 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -35,7 +35,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -77,7 +77,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> AsyncItemPaged["_models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -184,7 +184,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py index 357af5d2bcd..14f22f7664a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/aio/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -102,7 +102,7 @@ async def test_four(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -161,7 +161,7 @@ async def test_five(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_models_py3.py index f3b491f644d..2e1ed58040d 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py index e8e8fd73de9..7e8f14c87e5 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -30,7 +30,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -186,7 +186,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py index 0de3bce040f..989c5e574f7 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -111,7 +111,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -218,7 +218,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py index 7ec00e9343e..accc9c597eb 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -206,7 +206,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_multiapi_service_client_operations.py index eb6b1c91320..452cde1deaf 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -42,7 +42,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -72,7 +72,7 @@ async def test_one(self, *, id: int, message: Optional[str] = None, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -115,7 +115,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -348,7 +348,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -462,7 +462,7 @@ async def test_different_calls(self, *, greeting_in_english: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_operation_group_one_operations.py index 5027fb9df33..1a75553d922 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -65,7 +65,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/models/_models_py3.py index 7b4bec0e8ab..65d9aba53c2 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_multiapi_service_client_operations.py index a95d32a500a..34454ef164a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -35,7 +35,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -151,7 +151,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -194,7 +194,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -540,7 +540,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_operation_group_one_operations.py index 3919ae35935..fb508c7eac7 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_multiapi_service_client_operations.py index a2b0e9e3aa1..a8c0e8c8912 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -59,7 +59,7 @@ async def test_one(self, *, id: int, message: Optional[str] = None, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -117,7 +117,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_one_operations.py index 29b61c84d7d..38c4ab3331c 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -103,7 +103,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ async def test_three(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_two_operations.py index fff2ed46149..cdf655c261c 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/aio/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -67,7 +67,7 @@ async def test_four(self, *, parameter_one: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_multiapi_service_client_operations.py index 21a2a075683..9e19879e807 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -107,7 +107,7 @@ def test_one(self, *, id: int, message: Optional[str] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -165,7 +165,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_one_operations.py index f0bb45f34f8..15c9b480e8d 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -146,7 +146,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -209,7 +209,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_two_operations.py index 3ee03e740f1..f4e193f6ead 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -91,7 +91,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_multiapi_service_client_operations.py index ec9d6d028fe..d77155bc4d0 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import AsyncPipelineClient @@ -35,7 +35,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -66,7 +66,7 @@ def test_paging(self, **kwargs: Any) -> AsyncItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -145,7 +145,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_one_operations.py index f8111fd393d..20df531cc3f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -35,7 +35,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -77,7 +77,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> AsyncItemPaged["_models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -184,7 +184,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_two_operations.py index 36a3a5d4aac..24e664c40dc 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/aio/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -102,7 +102,7 @@ async def test_four(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -161,7 +161,7 @@ async def test_five(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/models/_models_py3.py index 09275b98e34..ccd153386da 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_multiapi_service_client_operations.py index 573b9f4feba..eef40589377 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -30,7 +30,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -187,7 +187,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_one_operations.py index 58023a70161..98bd5f8ed3c 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -111,7 +111,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -218,7 +218,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_two_operations.py index 1f129a41ba3..7d786167397 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiKeywordOnly/multiapikeywordonly/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -206,7 +206,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/models/_models_py3.py index 0e6ca3b3c37..9c636fae2e8 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py index fbd91630cb9..7dde506fc23 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -152,7 +152,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -195,7 +195,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -423,7 +423,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -539,7 +539,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_operation_group_one_operations.py index 6eead699f14..e7b2ecf8828 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py index eb9667d4ee9..4e920f62b0f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> _mo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py index 989e7bd0329..f742345148d 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -210,7 +210,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_two_operations.py index de3868c548c..c5b3ec35ac7 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -90,7 +90,7 @@ def test_four(self, parameter_one: bool, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_models_py3.py index 1b8cf407f51..3edd786f3cc 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py index c51d68a4019..77472e39282 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -109,7 +109,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -187,7 +187,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py index cd3e27b7e2a..0cb22da8653 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -112,7 +112,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -219,7 +219,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py index 15674246d9b..a196cc94d63 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -207,7 +207,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/aio/operations/_operation_group_one_operations.py index 63dce16d4c6..c090f058bdb 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -65,7 +65,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/models/_models_py3.py index 8a0e693958a..a0ed1b7390e 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/operations/_operation_group_one_operations.py index 058e56438e6..3065f5779e6 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v0/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_multiapi_service_client_operations.py index 6355ac0bade..e4a82b3328e 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -42,7 +42,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -72,7 +72,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -115,7 +115,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -270,7 +270,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -346,7 +346,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -460,7 +460,7 @@ async def test_different_calls(self, greeting_in_english: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_operation_group_one_operations.py index fb90a664507..f91d464f255 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -65,7 +65,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/models/_models_py3.py index c2e625ad032..953d580a4c2 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_multiapi_service_client_operations.py index 741e752ad66..ef7a31326c5 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -35,7 +35,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -151,7 +151,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -194,7 +194,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -346,7 +346,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -422,7 +422,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -538,7 +538,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_operation_group_one_operations.py index 7662a7e36bb..6238d8c51f9 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiSecurity/multiapisecurity/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -86,7 +86,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_serialization.py index 05bcd7d403a..8e4e94382c1 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/_serialization.py @@ -14,7 +14,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -24,7 +23,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -222,12 +220,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -304,7 +302,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -373,7 +371,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -407,7 +405,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -521,7 +519,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -572,7 +570,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1177,7 +1175,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1379,7 +1377,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py index ed2abb12dca..132dcd748eb 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_multiapi_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -43,7 +43,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -73,7 +73,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -116,7 +116,7 @@ async def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ async def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -348,7 +348,7 @@ async def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -462,7 +462,7 @@ async def test_different_calls(self, greeting_in_english: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_operation_group_one_operations.py index 8a9a62edd42..5909fd64bc6 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/aio/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -66,7 +66,7 @@ async def test_two(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/models/_models_py3.py index 89ad9df253a..6376b2a5f16 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -55,7 +55,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.Product"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py index 460e97d1d07..87b10683cc8 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload import urllib.parse from azure.core import PipelineClient @@ -36,7 +36,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -152,7 +152,7 @@ def test_one( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -195,7 +195,7 @@ def _test_lro_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def _test_lro_and_paging_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def begin_test_lro_and_paging( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -540,7 +540,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_operation_group_one_operations.py index 2a88351d307..b0b55ae13ae 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v1/operations/_operation_group_one_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def test_two(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py index 8a517325f3d..27a7414989f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -60,7 +60,7 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -118,7 +118,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py index fcd3097bafc..557f0d7fe9b 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -104,7 +104,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -167,7 +167,7 @@ async def test_three(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_two_operations.py index 9d9495d9cee..9e9a302a786 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/aio/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -68,7 +68,7 @@ async def test_four(self, parameter_one: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py index 8b55c98da92..24c03e53c53 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -108,7 +108,7 @@ def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any) -> _mo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -166,7 +166,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py index 0b4f3f256ab..2edd202a636 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -147,7 +147,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -210,7 +210,7 @@ def test_three(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_two_operations.py index 188a9a3963e..e3104de22ac 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v2/operations/_operation_group_two_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -90,7 +90,7 @@ def test_four(self, parameter_one: bool, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_utils/serialization.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_utils/serialization.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py index 4ba0d61e8bb..37465dc623a 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_multiapi_service_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultiapiServiceClientOperationsMixin( @@ -68,7 +68,7 @@ def test_paging(self, **kwargs: Any) -> AsyncItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -146,7 +146,7 @@ async def test_different_calls( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py index ef98d169b63..283cb1283f7 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import AsyncPipelineClient @@ -36,7 +36,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupOneOperations: @@ -79,7 +79,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> AsyncItemPaged["_models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -186,7 +186,7 @@ async def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py index f82398c6d8f..d9e847d9b3f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/aio/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import MultiapiServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OperationGroupTwoOperations: @@ -103,7 +103,7 @@ async def test_four(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -162,7 +162,7 @@ async def test_five(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_models_py3.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_models_py3.py index 526b8aa9272..1f2ffbc7532 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_models_py3.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -75,7 +75,7 @@ class PagingResult(_serialization.Model): } def __init__( - self, *, values: Optional[List["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any + self, *, values: Optional[list["_models.ModelThree"]] = None, next_link: Optional[str] = None, **kwargs: Any ) -> None: """ :keyword values: diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py index f1947c0c778..4b2c307002d 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_multiapi_service_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -109,7 +109,7 @@ def test_paging(self, **kwargs: Any) -> ItemPaged["_models.ModelThree"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -187,7 +187,7 @@ def test_different_calls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py index e36defb01b5..251fa362f8f 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_one_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload import urllib.parse from azure.core import PipelineClient @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -112,7 +112,7 @@ def test_operation_group_paging(self, **kwargs: Any) -> ItemPaged["_models.Model 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -219,7 +219,7 @@ def test_two( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py index 0b0effb9e55..3586c4c79aa 100644 --- a/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py +++ b/packages/autorest.python/test/multiapi/Expected/AcceptanceTests/MultiapiWithSubmodule/multiapiwithsubmodule/submodule/v3/operations/_operation_group_two_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -148,7 +148,7 @@ def test_four( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -207,7 +207,7 @@ def test_five(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) diff --git a/packages/autorest.python/test/unittests/storage_models/serialization.py b/packages/autorest.python/test/unittests/storage_models/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/unittests/storage_models/serialization.py +++ b/packages/autorest.python/test/unittests/storage_models/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py index 5412ce8d2e3..59845df0569 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/aio/operations/_pets_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ from .._configuration import AdditionalPropertiesClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PetsOperations: @@ -110,7 +110,7 @@ async def create_ap_true( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -204,7 +204,7 @@ async def create_cat_ap_true( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -298,7 +298,7 @@ async def create_ap_object( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -392,7 +392,7 @@ async def create_ap_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -486,7 +486,7 @@ async def create_ap_in_properties( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -586,7 +586,7 @@ async def create_ap_in_properties_with_ap_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/models/_models_py3.py index 838921313c4..439901ce4c8 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Dict, Optional +from typing import Any, Optional from .._utils import serialization as _serialization @@ -45,7 +45,7 @@ def __init__( self, *, id: int, # pylint: disable=redefined-builtin - additional_properties: Optional[Dict[str, Any]] = None, + additional_properties: Optional[dict[str, Any]] = None, name: Optional[str] = None, **kwargs: Any ) -> None: @@ -102,7 +102,7 @@ def __init__( self, *, id: int, # pylint: disable=redefined-builtin - additional_properties: Optional[Dict[str, Any]] = None, + additional_properties: Optional[dict[str, Any]] = None, name: Optional[str] = None, friendly: Optional[bool] = None, **kwargs: Any @@ -182,7 +182,7 @@ def __init__( *, id: int, # pylint: disable=redefined-builtin name: Optional[str] = None, - additional_properties: Optional[Dict[str, float]] = None, + additional_properties: Optional[dict[str, float]] = None, **kwargs: Any ) -> None: """ @@ -242,9 +242,9 @@ def __init__( *, id: int, # pylint: disable=redefined-builtin odata_location: str, - additional_properties: Optional[Dict[str, str]] = None, + additional_properties: Optional[dict[str, str]] = None, name: Optional[str] = None, - additional_properties1: Optional[Dict[str, float]] = None, + additional_properties1: Optional[dict[str, float]] = None, **kwargs: Any ) -> None: """ @@ -303,7 +303,7 @@ def __init__( self, *, id: int, # pylint: disable=redefined-builtin - additional_properties: Optional[Dict[str, Any]] = None, + additional_properties: Optional[dict[str, Any]] = None, name: Optional[str] = None, **kwargs: Any ) -> None: @@ -357,7 +357,7 @@ def __init__( self, *, id: int, # pylint: disable=redefined-builtin - additional_properties: Optional[Dict[str, str]] = None, + additional_properties: Optional[dict[str, str]] = None, name: Optional[str] = None, **kwargs: Any ) -> None: diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py index 74da7b68c2b..01e1c0f2bfc 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/AdditionalProperties/additionalproperties/operations/_pets_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -207,7 +207,7 @@ def create_ap_true( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -301,7 +301,7 @@ def create_cat_ap_true( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -395,7 +395,7 @@ def create_ap_object( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -489,7 +489,7 @@ def create_ap_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -583,7 +583,7 @@ def create_ap_in_properties( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -683,7 +683,7 @@ def create_ap_in_properties_with_ap_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_anything_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_anything_client.py index c438a07d97a..7b3c2099c60 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_anything_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_anything_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -51,7 +51,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/_anything_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/_anything_client.py index d5809c12117..588e256c8af 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/_anything_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/_anything_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -51,7 +51,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/operations/_anything_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/operations/_anything_client_operations.py index bef40570451..de3420c5b03 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/operations/_anything_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/aio/operations/_anything_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AnythingClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AnythingClientOperationsMixin( @@ -57,7 +57,7 @@ async def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -105,7 +105,7 @@ async def put_object(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -151,7 +151,7 @@ async def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -199,7 +199,7 @@ async def put_string(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -245,7 +245,7 @@ async def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -293,7 +293,7 @@ async def put_array(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/operations/_anything_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/operations/_anything_client_operations.py index 6bc7e474e30..651e3819d5c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/operations/_anything_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Anything/anything/operations/_anything_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -136,7 +136,7 @@ def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ def put_object(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -230,7 +230,7 @@ def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -278,7 +278,7 @@ def put_string(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -324,7 +324,7 @@ def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -372,7 +372,7 @@ def put_array(self, input: Any, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py index 68314979749..c8cc5090690 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/aio/operations/_array_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -101,7 +101,7 @@ from .._configuration import AutoRestSwaggerBATArrayServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ArrayOperations: # pylint: disable=too-many-public-methods @@ -126,7 +126,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> List[int]: + async def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int or the result of cls(response) @@ -139,12 +139,12 @@ async def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -172,7 +172,7 @@ async def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> List[int]: + async def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int or the result of cls(response) @@ -185,12 +185,12 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -218,7 +218,7 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> List[int]: + async def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int or the result of cls(response) @@ -231,12 +231,12 @@ async def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -264,7 +264,7 @@ async def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -292,7 +292,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value empty []. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -307,7 +307,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -348,7 +348,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool or the result of cls(response) @@ -361,12 +361,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -395,7 +395,7 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload async def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -426,7 +426,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [true, false, false, true]. :param array_body: Is either a [bool] type or a IO[bytes] type. Required. @@ -441,7 +441,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -482,7 +482,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool or the result of cls(response) @@ -495,12 +495,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -528,7 +528,7 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool or the result of cls(response) @@ -541,12 +541,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -574,7 +574,7 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> List[int]: + async def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -587,12 +587,12 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -621,7 +621,7 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload async def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -652,7 +652,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -667,7 +667,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -708,7 +708,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -721,12 +721,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -754,7 +754,7 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -767,12 +767,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -800,7 +800,7 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> List[int]: + async def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -813,12 +813,12 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -847,7 +847,7 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: @overload async def put_long_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -878,7 +878,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -893,7 +893,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -934,7 +934,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -947,12 +947,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -980,7 +980,7 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -993,12 +993,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1026,7 +1026,7 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> List[float]: + async def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1039,12 +1039,12 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -1073,7 +1073,7 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: @overload async def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1104,7 +1104,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1119,7 +1119,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1160,7 +1160,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -1173,12 +1173,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -1206,7 +1206,7 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -1219,12 +1219,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -1252,7 +1252,7 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> List[float]: + async def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1265,12 +1265,12 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -1299,7 +1299,7 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: @overload async def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1330,7 +1330,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1345,7 +1345,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1386,7 +1386,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -1399,12 +1399,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -1432,7 +1432,7 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -1445,12 +1445,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -1478,7 +1478,7 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> List[str]: + async def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str or the result of cls(response) @@ -1491,12 +1491,12 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -1525,7 +1525,7 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: @overload async def put_string_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1556,7 +1556,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -1571,7 +1571,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1612,7 +1612,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + async def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum or the result of cls(response) @@ -1625,12 +1625,12 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_get_enum_valid_request( headers=_headers, @@ -1659,7 +1659,7 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum @overload async def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1691,7 +1691,7 @@ async def put_enum_valid( @distributed_trace_async async def put_enum_valid( - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1708,7 +1708,7 @@ async def put_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1749,7 +1749,7 @@ async def put_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + async def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 or the result of cls(response) @@ -1762,12 +1762,12 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_get_string_enum_valid_request( headers=_headers, @@ -1796,7 +1796,7 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. @overload async def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1828,7 +1828,7 @@ async def put_string_enum_valid( @distributed_trace_async async def put_string_enum_valid( - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1845,7 +1845,7 @@ async def put_string_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1886,7 +1886,7 @@ async def put_string_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> List[str]: + async def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str or the result of cls(response) @@ -1899,12 +1899,12 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -1932,7 +1932,7 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + async def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str or the result of cls(response) @@ -1945,12 +1945,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -1978,7 +1978,7 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_uuid_valid(self, **kwargs: Any) -> List[str]: + async def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -1992,12 +1992,12 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_valid_request( headers=_headers, @@ -2026,7 +2026,7 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: @overload async def put_uuid_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2059,7 +2059,7 @@ async def put_uuid_valid( """ @distributed_trace_async - async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_uuid_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2075,7 +2075,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2116,7 +2116,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + async def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str or the result of cls(response) @@ -2129,12 +2129,12 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_invalid_chars_request( headers=_headers, @@ -2162,7 +2162,7 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date or the result of cls(response) @@ -2175,12 +2175,12 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -2209,7 +2209,7 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload async def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -2240,7 +2240,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. :param array_body: Is either a [datetime.date] type or a IO[bytes] type. Required. @@ -2255,7 +2255,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2296,7 +2296,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date or the result of cls(response) @@ -2309,12 +2309,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -2342,7 +2342,7 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date or the result of cls(response) @@ -2355,12 +2355,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -2388,7 +2388,7 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2402,12 +2402,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -2436,7 +2436,7 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload async def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2469,7 +2469,7 @@ async def put_date_time_valid( """ @distributed_trace_async - async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put_date_time_valid(self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2485,7 +2485,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2526,7 +2526,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime or the result of cls(response) @@ -2539,12 +2539,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -2572,7 +2572,7 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet return deserialized # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime or the result of cls(response) @@ -2585,12 +2585,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -2618,7 +2618,7 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date return deserialized # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2632,12 +2632,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -2666,7 +2666,7 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date @overload async def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2700,7 +2700,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2717,7 +2717,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2758,7 +2758,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta or the result of cls(response) @@ -2771,12 +2771,12 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -2805,7 +2805,7 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload async def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -2836,7 +2836,7 @@ async def put_duration_valid( """ @distributed_trace_async - async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put_duration_valid(self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :param array_body: Is either a [datetime.timedelta] type or a IO[bytes] type. Required. @@ -2851,7 +2851,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2892,7 +2892,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + async def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -2906,12 +2906,12 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -2940,7 +2940,7 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: @overload async def put_byte_valid( - self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2973,7 +2973,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2989,7 +2989,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3030,7 +3030,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes or the result of cls(response) @@ -3043,12 +3043,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -3076,7 +3076,7 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> List[bytes]: + async def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -3090,12 +3090,12 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -3123,7 +3123,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product or the result of cls(response) @@ -3136,12 +3136,12 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -3169,7 +3169,7 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product or the result of cls(response) @@ -3182,12 +3182,12 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -3215,7 +3215,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3229,12 +3229,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -3262,7 +3262,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3276,12 +3276,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -3309,7 +3309,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3323,12 +3323,12 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -3357,7 +3357,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload async def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3390,7 +3390,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3406,7 +3406,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3447,7 +3447,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str or the result of cls(response) @@ -3460,12 +3460,12 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -3493,7 +3493,7 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str or the result of cls(response) @@ -3506,12 +3506,12 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -3539,7 +3539,7 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3552,12 +3552,12 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -3585,7 +3585,7 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3598,12 +3598,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -3631,7 +3631,7 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + async def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3644,12 +3644,12 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -3678,7 +3678,7 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload async def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -3709,7 +3709,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :param array_body: Is either a [[str]] type or a IO[bytes] type. Required. @@ -3724,7 +3724,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3765,7 +3765,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str or the result of cls(response) @@ -3778,12 +3778,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -3811,7 +3811,7 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str or the result of cls(response) @@ -3824,12 +3824,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -3857,7 +3857,7 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3871,12 +3871,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -3904,7 +3904,7 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3918,12 +3918,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -3951,7 +3951,7 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3965,12 +3965,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -3999,7 +3999,7 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload async def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4032,7 +4032,7 @@ async def put_dictionary_valid( """ @distributed_trace_async - async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any) -> None: + async def put_dictionary_valid(self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4048,7 +4048,7 @@ async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py index acc680489ca..ee6b6180d50 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArray/bodyarray/operations/_array_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1078,7 +1078,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> List[int]: + def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int or the result of cls(response) @@ -1091,12 +1091,12 @@ def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -1124,7 +1124,7 @@ def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> List[int]: + def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int or the result of cls(response) @@ -1137,12 +1137,12 @@ def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -1170,7 +1170,7 @@ def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> List[int]: + def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int or the result of cls(response) @@ -1183,12 +1183,12 @@ def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -1216,7 +1216,7 @@ def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -1245,7 +1245,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty []. @@ -1261,7 +1261,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1302,7 +1302,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool or the result of cls(response) @@ -1315,12 +1315,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -1349,7 +1349,7 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1379,7 +1379,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1395,7 +1395,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1436,7 +1436,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool or the result of cls(response) @@ -1449,12 +1449,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -1482,7 +1482,7 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool or the result of cls(response) @@ -1495,12 +1495,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -1528,7 +1528,7 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> List[int]: + def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -1541,12 +1541,12 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -1575,7 +1575,7 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1607,7 +1607,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1623,7 +1623,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1664,7 +1664,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -1677,12 +1677,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -1710,7 +1710,7 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -1723,12 +1723,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -1756,7 +1756,7 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> List[int]: + def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -1769,12 +1769,12 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -1802,7 +1802,7 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_long_valid(self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_long_valid(self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Required. @@ -1831,7 +1831,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1847,7 +1847,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1888,7 +1888,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -1901,12 +1901,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -1934,7 +1934,7 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -1947,12 +1947,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1980,7 +1980,7 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> List[float]: + def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1993,12 +1993,12 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -2027,7 +2027,7 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: @overload def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2057,7 +2057,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2073,7 +2073,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2114,7 +2114,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -2127,12 +2127,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -2160,7 +2160,7 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -2173,12 +2173,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -2206,7 +2206,7 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> List[float]: + def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -2219,12 +2219,12 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -2253,7 +2253,7 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: @overload def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2283,7 +2283,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2299,7 +2299,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2340,7 +2340,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -2353,12 +2353,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -2386,7 +2386,7 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -2399,12 +2399,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -2432,7 +2432,7 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> List[str]: + def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str or the result of cls(response) @@ -2445,12 +2445,12 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -2478,7 +2478,7 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_string_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_string_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Required. @@ -2507,7 +2507,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2523,7 +2523,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2564,7 +2564,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum or the result of cls(response) @@ -2577,12 +2577,12 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_get_enum_valid_request( headers=_headers, @@ -2611,7 +2611,7 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: @overload def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2641,7 +2641,7 @@ def put_enum_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2658,7 +2658,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2699,7 +2699,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 or the result of cls(response) @@ -2712,12 +2712,12 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_get_string_enum_valid_request( headers=_headers, @@ -2746,7 +2746,7 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] @overload def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2778,7 +2778,7 @@ def put_string_enum_valid( @distributed_trace def put_string_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2795,7 +2795,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2836,7 +2836,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> List[str]: + def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str or the result of cls(response) @@ -2849,12 +2849,12 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -2882,7 +2882,7 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str or the result of cls(response) @@ -2895,12 +2895,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -2928,7 +2928,7 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_uuid_valid(self, **kwargs: Any) -> List[str]: + def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2942,12 +2942,12 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_valid_request( headers=_headers, @@ -2975,7 +2975,7 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_uuid_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_uuid_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3006,7 +3006,7 @@ def put_uuid_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_uuid_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3023,7 +3023,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3064,7 +3064,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str or the result of cls(response) @@ -3077,12 +3077,12 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_invalid_chars_request( headers=_headers, @@ -3110,7 +3110,7 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date or the result of cls(response) @@ -3123,12 +3123,12 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -3157,7 +3157,7 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3187,7 +3187,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3203,7 +3203,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3244,7 +3244,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date or the result of cls(response) @@ -3257,12 +3257,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -3290,7 +3290,7 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date or the result of cls(response) @@ -3303,12 +3303,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -3336,7 +3336,7 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3350,12 +3350,12 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -3384,7 +3384,7 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3418,7 +3418,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3435,7 +3435,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3476,7 +3476,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime or the result of cls(response) @@ -3489,12 +3489,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -3522,7 +3522,7 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime or the result of cls(response) @@ -3535,12 +3535,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -3568,7 +3568,7 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3582,12 +3582,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3616,7 +3616,7 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3650,7 +3650,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3667,7 +3667,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3708,7 +3708,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta or the result of cls(response) @@ -3721,12 +3721,12 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -3755,7 +3755,7 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3787,7 +3787,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3803,7 +3803,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3844,7 +3844,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -3858,12 +3858,12 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -3891,7 +3891,7 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @overload - def put_byte_valid(self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_byte_valid(self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3922,7 +3922,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3939,7 +3939,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3980,7 +3980,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes or the result of cls(response) @@ -3993,12 +3993,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -4026,7 +4026,7 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> List[bytes]: + def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -4040,12 +4040,12 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -4073,7 +4073,7 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product or the result of cls(response) @@ -4086,12 +4086,12 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -4119,7 +4119,7 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product or the result of cls(response) @@ -4132,12 +4132,12 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -4165,7 +4165,7 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -4179,12 +4179,12 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -4212,7 +4212,7 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -4226,12 +4226,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -4259,7 +4259,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4273,12 +4273,12 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -4307,7 +4307,7 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4341,7 +4341,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any + self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4358,7 +4358,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4399,7 +4399,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str or the result of cls(response) @@ -4412,12 +4412,12 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -4445,7 +4445,7 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str or the result of cls(response) @@ -4458,12 +4458,12 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -4491,7 +4491,7 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4504,12 +4504,12 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -4537,7 +4537,7 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4550,12 +4550,12 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -4583,7 +4583,7 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4596,12 +4596,12 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -4630,7 +4630,7 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4660,7 +4660,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4676,7 +4676,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4717,7 +4717,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str or the result of cls(response) @@ -4730,12 +4730,12 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -4763,7 +4763,7 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str or the result of cls(response) @@ -4776,12 +4776,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -4809,7 +4809,7 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4823,12 +4823,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -4856,7 +4856,7 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4870,12 +4870,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -4903,7 +4903,7 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4917,12 +4917,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -4951,7 +4951,7 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4985,7 +4985,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5002,7 +5002,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py index b64882ea816..cb5f26dc3ec 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/aio/operations/_array_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -101,7 +101,7 @@ from .._configuration import AutoRestSwaggerBATArrayServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ArrayOperations: # pylint: disable=too-many-public-methods @@ -126,7 +126,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> List[int]: + async def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int or the result of cls(response) @@ -139,12 +139,12 @@ async def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -172,7 +172,7 @@ async def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> List[int]: + async def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int or the result of cls(response) @@ -185,12 +185,12 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -218,7 +218,7 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> List[int]: + async def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int or the result of cls(response) @@ -231,12 +231,12 @@ async def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -264,7 +264,7 @@ async def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -292,7 +292,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value empty []. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -307,7 +307,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -348,7 +348,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool or the result of cls(response) @@ -361,12 +361,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -395,7 +395,7 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload async def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -426,7 +426,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [true, false, false, true]. :param array_body: Is either a [bool] type or a IO[bytes] type. Required. @@ -441,7 +441,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -482,7 +482,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool or the result of cls(response) @@ -495,12 +495,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -528,7 +528,7 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool or the result of cls(response) @@ -541,12 +541,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -574,7 +574,7 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> List[int]: + async def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -587,12 +587,12 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -621,7 +621,7 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload async def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -652,7 +652,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -667,7 +667,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -708,7 +708,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -721,12 +721,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -754,7 +754,7 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -767,12 +767,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -800,7 +800,7 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> List[int]: + async def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -813,12 +813,12 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -847,7 +847,7 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: @overload async def put_long_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -878,7 +878,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -893,7 +893,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -934,7 +934,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -947,12 +947,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -980,7 +980,7 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -993,12 +993,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1026,7 +1026,7 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> List[float]: + async def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1039,12 +1039,12 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -1073,7 +1073,7 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: @overload async def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1104,7 +1104,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1119,7 +1119,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1160,7 +1160,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -1173,12 +1173,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -1206,7 +1206,7 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -1219,12 +1219,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -1252,7 +1252,7 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> List[float]: + async def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1265,12 +1265,12 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -1299,7 +1299,7 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: @overload async def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1330,7 +1330,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1345,7 +1345,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1386,7 +1386,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -1399,12 +1399,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -1432,7 +1432,7 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -1445,12 +1445,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -1478,7 +1478,7 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> List[str]: + async def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str or the result of cls(response) @@ -1491,12 +1491,12 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -1525,7 +1525,7 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: @overload async def put_string_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1556,7 +1556,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -1571,7 +1571,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1612,7 +1612,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + async def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum or the result of cls(response) @@ -1625,12 +1625,12 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_get_enum_valid_request( headers=_headers, @@ -1659,7 +1659,7 @@ async def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum @overload async def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1691,7 +1691,7 @@ async def put_enum_valid( @distributed_trace_async async def put_enum_valid( - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1708,7 +1708,7 @@ async def put_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1749,7 +1749,7 @@ async def put_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + async def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 or the result of cls(response) @@ -1762,12 +1762,12 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_get_string_enum_valid_request( headers=_headers, @@ -1796,7 +1796,7 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models. @overload async def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1828,7 +1828,7 @@ async def put_string_enum_valid( @distributed_trace_async async def put_string_enum_valid( - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1845,7 +1845,7 @@ async def put_string_enum_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1886,7 +1886,7 @@ async def put_string_enum_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> List[str]: + async def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str or the result of cls(response) @@ -1899,12 +1899,12 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -1932,7 +1932,7 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + async def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str or the result of cls(response) @@ -1945,12 +1945,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -1978,7 +1978,7 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_uuid_valid(self, **kwargs: Any) -> List[str]: + async def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -1992,12 +1992,12 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_valid_request( headers=_headers, @@ -2026,7 +2026,7 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: @overload async def put_uuid_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2059,7 +2059,7 @@ async def put_uuid_valid( """ @distributed_trace_async - async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_uuid_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2075,7 +2075,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2116,7 +2116,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + async def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str or the result of cls(response) @@ -2129,12 +2129,12 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_invalid_chars_request( headers=_headers, @@ -2162,7 +2162,7 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date or the result of cls(response) @@ -2175,12 +2175,12 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -2209,7 +2209,7 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload async def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -2240,7 +2240,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. :param array_body: Is either a [datetime.date] type or a IO[bytes] type. Required. @@ -2255,7 +2255,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2296,7 +2296,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date or the result of cls(response) @@ -2309,12 +2309,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -2342,7 +2342,7 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date or the result of cls(response) @@ -2355,12 +2355,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -2388,7 +2388,7 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2402,12 +2402,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -2436,7 +2436,7 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload async def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2469,7 +2469,7 @@ async def put_date_time_valid( """ @distributed_trace_async - async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put_date_time_valid(self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2485,7 +2485,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2526,7 +2526,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime or the result of cls(response) @@ -2539,12 +2539,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -2572,7 +2572,7 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet return deserialized # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime or the result of cls(response) @@ -2585,12 +2585,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -2618,7 +2618,7 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date return deserialized # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2632,12 +2632,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -2666,7 +2666,7 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date @overload async def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2700,7 +2700,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -2717,7 +2717,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2758,7 +2758,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta or the result of cls(response) @@ -2771,12 +2771,12 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -2805,7 +2805,7 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload async def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -2836,7 +2836,7 @@ async def put_duration_valid( """ @distributed_trace_async - async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put_duration_valid(self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :param array_body: Is either a [datetime.timedelta] type or a IO[bytes] type. Required. @@ -2851,7 +2851,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2892,7 +2892,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + async def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -2906,12 +2906,12 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -2940,7 +2940,7 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: @overload async def put_byte_valid( - self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2973,7 +2973,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -2989,7 +2989,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3030,7 +3030,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes or the result of cls(response) @@ -3043,12 +3043,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -3076,7 +3076,7 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> List[bytes]: + async def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -3090,12 +3090,12 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -3123,7 +3123,7 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product or the result of cls(response) @@ -3136,12 +3136,12 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -3169,7 +3169,7 @@ async def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product or the result of cls(response) @@ -3182,12 +3182,12 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -3215,7 +3215,7 @@ async def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3229,12 +3229,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -3262,7 +3262,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3276,12 +3276,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -3309,7 +3309,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + async def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3323,12 +3323,12 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -3357,7 +3357,7 @@ async def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload async def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3390,7 +3390,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3406,7 +3406,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3447,7 +3447,7 @@ async def put_complex_valid(self, array_body: Union[List[_models.Product], IO[by return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str or the result of cls(response) @@ -3460,12 +3460,12 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -3493,7 +3493,7 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str or the result of cls(response) @@ -3506,12 +3506,12 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -3539,7 +3539,7 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3552,12 +3552,12 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -3585,7 +3585,7 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3598,12 +3598,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -3631,7 +3631,7 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + async def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -3644,12 +3644,12 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -3678,7 +3678,7 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload async def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -3709,7 +3709,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :param array_body: Is either a [[str]] type or a IO[bytes] type. Required. @@ -3724,7 +3724,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3765,7 +3765,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str or the result of cls(response) @@ -3778,12 +3778,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -3811,7 +3811,7 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str or the result of cls(response) @@ -3824,12 +3824,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -3857,7 +3857,7 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3871,12 +3871,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -3904,7 +3904,7 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3918,12 +3918,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -3951,7 +3951,7 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -3965,12 +3965,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -3999,7 +3999,7 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload async def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4032,7 +4032,7 @@ async def put_dictionary_valid( """ @distributed_trace_async - async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any) -> None: + async def put_dictionary_valid(self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4048,7 +4048,7 @@ async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py index 6091c810760..da5767982d4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyArrayWithNamespaceFolders/vanilla/body/array/operations/_array_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1078,7 +1078,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> List[int]: + def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int or the result of cls(response) @@ -1091,12 +1091,12 @@ def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -1124,7 +1124,7 @@ def get_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> List[int]: + def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int or the result of cls(response) @@ -1137,12 +1137,12 @@ def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -1170,7 +1170,7 @@ def get_invalid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> List[int]: + def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int or the result of cls(response) @@ -1183,12 +1183,12 @@ def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -1216,7 +1216,7 @@ def get_empty(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -1245,7 +1245,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty []. @@ -1261,7 +1261,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1302,7 +1302,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool or the result of cls(response) @@ -1315,12 +1315,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -1349,7 +1349,7 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: @overload def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1379,7 +1379,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1395,7 +1395,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1436,7 +1436,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool or the result of cls(response) @@ -1449,12 +1449,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -1482,7 +1482,7 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool or the result of cls(response) @@ -1495,12 +1495,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -1528,7 +1528,7 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> List[int]: + def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -1541,12 +1541,12 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -1575,7 +1575,7 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: @overload def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1607,7 +1607,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1623,7 +1623,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1664,7 +1664,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -1677,12 +1677,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -1710,7 +1710,7 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -1723,12 +1723,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -1756,7 +1756,7 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> List[int]: + def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int or the result of cls(response) @@ -1769,12 +1769,12 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -1802,7 +1802,7 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put_long_valid(self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_long_valid(self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Required. @@ -1831,7 +1831,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1847,7 +1847,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1888,7 +1888,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int or the result of cls(response) @@ -1901,12 +1901,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -1934,7 +1934,7 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int or the result of cls(response) @@ -1947,12 +1947,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1980,7 +1980,7 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> List[float]: + def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -1993,12 +1993,12 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -2027,7 +2027,7 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: @overload def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2057,7 +2057,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2073,7 +2073,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2114,7 +2114,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -2127,12 +2127,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -2160,7 +2160,7 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -2173,12 +2173,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -2206,7 +2206,7 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> List[float]: + def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float or the result of cls(response) @@ -2219,12 +2219,12 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -2253,7 +2253,7 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: @overload def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2283,7 +2283,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2299,7 +2299,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2340,7 +2340,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float or the result of cls(response) @@ -2353,12 +2353,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -2386,7 +2386,7 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float or the result of cls(response) @@ -2399,12 +2399,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -2432,7 +2432,7 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> List[str]: + def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str or the result of cls(response) @@ -2445,12 +2445,12 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -2478,7 +2478,7 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_string_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_string_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Required. @@ -2507,7 +2507,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2523,7 +2523,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2564,7 +2564,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: + def get_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.FooEnum]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of FooEnum or the result of cls(response) @@ -2577,12 +2577,12 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.FooEnum]]] = kwargs.pop("cls", None) _request = build_get_enum_valid_request( headers=_headers, @@ -2611,7 +2611,7 @@ def get_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.FooEnum]]: @overload def put_enum_valid( - self, array_body: List[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.FooEnum]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2641,7 +2641,7 @@ def put_enum_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.FooEnum]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2658,7 +2658,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2699,7 +2699,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0]]: + def get_string_enum_valid(self, **kwargs: Any) -> list[Union[str, _models.Enum0]]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of Enum0 or the result of cls(response) @@ -2712,12 +2712,12 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) + cls: ClsType[list[Union[str, _models.Enum0]]] = kwargs.pop("cls", None) _request = build_get_string_enum_valid_request( headers=_headers, @@ -2746,7 +2746,7 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[Union[str, _models.Enum0] @overload def put_string_enum_valid( - self, array_body: List[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[Union[str, _models.Enum1]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2778,7 +2778,7 @@ def put_string_enum_valid( @distributed_trace def put_string_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[Union[str, _models.Enum1]], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2795,7 +2795,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2836,7 +2836,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> List[str]: + def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str or the result of cls(response) @@ -2849,12 +2849,12 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -2882,7 +2882,7 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str or the result of cls(response) @@ -2895,12 +2895,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -2928,7 +2928,7 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_uuid_valid(self, **kwargs: Any) -> List[str]: + def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2942,12 +2942,12 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_valid_request( headers=_headers, @@ -2975,7 +2975,7 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put_uuid_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_uuid_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3006,7 +3006,7 @@ def put_uuid_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_uuid_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3023,7 +3023,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3064,7 +3064,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str or the result of cls(response) @@ -3077,12 +3077,12 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_get_uuid_invalid_chars_request( headers=_headers, @@ -3110,7 +3110,7 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date or the result of cls(response) @@ -3123,12 +3123,12 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -3157,7 +3157,7 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: @overload def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3187,7 +3187,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3203,7 +3203,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3244,7 +3244,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date or the result of cls(response) @@ -3257,12 +3257,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -3290,7 +3290,7 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date or the result of cls(response) @@ -3303,12 +3303,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -3336,7 +3336,7 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3350,12 +3350,12 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -3384,7 +3384,7 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3418,7 +3418,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3435,7 +3435,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3476,7 +3476,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime or the result of cls(response) @@ -3489,12 +3489,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -3522,7 +3522,7 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime or the result of cls(response) @@ -3535,12 +3535,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -3568,7 +3568,7 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3582,12 +3582,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3616,7 +3616,7 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: @overload def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3650,7 +3650,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3667,7 +3667,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3708,7 +3708,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta or the result of cls(response) @@ -3721,12 +3721,12 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -3755,7 +3755,7 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: @overload def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3787,7 +3787,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3803,7 +3803,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3844,7 +3844,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -3858,12 +3858,12 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -3891,7 +3891,7 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @overload - def put_byte_valid(self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_byte_valid(self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3922,7 +3922,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3939,7 +3939,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3980,7 +3980,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes or the result of cls(response) @@ -3993,12 +3993,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -4026,7 +4026,7 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> List[bytes]: + def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -4040,12 +4040,12 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -4073,7 +4073,7 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: return deserialized # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type null value. :return: list of Product or the result of cls(response) @@ -4086,12 +4086,12 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -4119,7 +4119,7 @@ def get_complex_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_empty(self, **kwargs: Any) -> list[_models.Product]: """Get empty array of complex type []. :return: list of Product or the result of cls(response) @@ -4132,12 +4132,12 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -4165,7 +4165,7 @@ def get_complex_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_null(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -4179,12 +4179,12 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -4212,7 +4212,7 @@ def get_complex_item_null(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_item_empty(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -4226,12 +4226,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -4259,7 +4259,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[_models.Product]: return deserialized # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: + def get_complex_valid(self, **kwargs: Any) -> list[_models.Product]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4273,12 +4273,12 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Product]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Product]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -4307,7 +4307,7 @@ def get_complex_valid(self, **kwargs: Any) -> List[_models.Product]: @overload def put_complex_valid( - self, array_body: List[_models.Product], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[_models.Product], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4341,7 +4341,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[_models.Product], IO[bytes]], **kwargs: Any + self, array_body: Union[list[_models.Product], IO[bytes]], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4358,7 +4358,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4399,7 +4399,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str or the result of cls(response) @@ -4412,12 +4412,12 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -4445,7 +4445,7 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str or the result of cls(response) @@ -4458,12 +4458,12 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -4491,7 +4491,7 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4504,12 +4504,12 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -4537,7 +4537,7 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4550,12 +4550,12 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -4583,7 +4583,7 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str or the result of cls(response) @@ -4596,12 +4596,12 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -4630,7 +4630,7 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: @overload def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4660,7 +4660,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4676,7 +4676,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4717,7 +4717,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str or the result of cls(response) @@ -4730,12 +4730,12 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -4763,7 +4763,7 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str or the result of cls(response) @@ -4776,12 +4776,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -4809,7 +4809,7 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4823,12 +4823,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -4856,7 +4856,7 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4870,12 +4870,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -4903,7 +4903,7 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4917,12 +4917,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -4951,7 +4951,7 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: @overload def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4985,7 +4985,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5002,7 +5002,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_download_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_download_operations.py index 5c916cb6213..1e916793321 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_download_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_download_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterator, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import BinaryWithContentTypeApplicationJsonConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DownloadOperations: @@ -67,7 +67,7 @@ async def error_stream(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_upload_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_upload_operations.py index 6efcfca60e1..e7a2ba034c7 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_upload_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_upload_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Optional, TypeVar +from typing import Any, Callable, IO, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import BinaryWithContentTypeApplicationJsonConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class UploadOperations: @@ -68,7 +68,7 @@ async def file(self, file_param: IO[bytes], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -116,7 +116,7 @@ async def binary(self, file_param: IO[bytes], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_download_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_download_operations.py index f1e02912d6f..6d0a45649df 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_download_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_download_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Optional, TypeVar +from typing import Any, Callable, Iterator, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def error_stream(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_upload_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_upload_operations.py index 4c5624dd9eb..b33396ece92 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_upload_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/operations/_upload_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Optional, TypeVar +from typing import Any, Callable, IO, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -98,7 +98,7 @@ def file(self, file_param: IO[bytes], **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -146,7 +146,7 @@ def binary(self, file_param: IO[bytes], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py index 11c100cc43f..f9474354559 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/aio/operations/_bool_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AutoRestBoolTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class BoolOperations: @@ -71,7 +71,7 @@ async def get_true(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -117,7 +117,7 @@ async def put_true(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -165,7 +165,7 @@ async def get_false(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -211,7 +211,7 @@ async def put_false(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -259,7 +259,7 @@ async def get_null(self, **kwargs: Any) -> Optional[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -305,7 +305,7 @@ async def get_invalid(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/operations/_bool_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/operations/_bool_operations.py index 3da1cf75f21..778bc57a4c6 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/operations/_bool_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBoolean/bodyboolean/operations/_bool_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -158,7 +158,7 @@ def get_true(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -204,7 +204,7 @@ def put_true(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -252,7 +252,7 @@ def get_false(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -298,7 +298,7 @@ def put_false(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -346,7 +346,7 @@ def get_null(self, **kwargs: Any) -> Optional[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -392,7 +392,7 @@ def get_invalid(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/_byte_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/_byte_operations.py index 503b16af62f..110881a3028 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/_byte_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/aio/operations/_byte_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import AutoRestSwaggerBATByteServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ByteOperations: @@ -72,7 +72,7 @@ async def get_null(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -118,7 +118,7 @@ async def get_empty(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -164,7 +164,7 @@ async def get_non_ascii(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def put_non_ascii(self, byte_body: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -260,7 +260,7 @@ async def get_invalid(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/operations/_byte_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/operations/_byte_operations.py index bc2cbd8d9da..bfffb8962b1 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/operations/_byte_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByte/bodybyte/operations/_byte_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -141,7 +141,7 @@ def get_null(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -187,7 +187,7 @@ def get_empty(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ def get_non_ascii(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -282,7 +282,7 @@ def put_non_ascii(self, byte_body: bytes, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -329,7 +329,7 @@ def get_invalid(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/_byte_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/_byte_operations.py index ab0c07f83e9..b6a200268d2 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/_byte_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/aio/operations/_byte_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import ClassNameConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ByteOperations: @@ -70,7 +70,7 @@ async def get_null(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -116,7 +116,7 @@ async def get_empty(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -162,7 +162,7 @@ async def get_non_ascii(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -211,7 +211,7 @@ async def put_non_ascii(self, byte_body: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -258,7 +258,7 @@ async def get_invalid(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/operations/_byte_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/operations/_byte_operations.py index f49b7e7d66c..6c1fa7393f9 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/operations/_byte_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyByteWithPackageName/bodybytewithpackagename/operations/_byte_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -139,7 +139,7 @@ def get_null(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def get_empty(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ def get_non_ascii(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -280,7 +280,7 @@ def put_non_ascii(self, byte_body: bytes, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -327,7 +327,7 @@ def get_invalid(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py index 5c76b20c30b..093c6b9a3d6 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_array_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -35,7 +35,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ArrayOperations: @@ -73,7 +73,7 @@ async def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -106,7 +106,7 @@ async def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: return deserialized # type: ignore @distributed_trace_async - async def put_valid(self, array: Optional[List[str]] = None, **kwargs: Any) -> None: + async def put_valid(self, array: Optional[list[str]] = None, **kwargs: Any) -> None: """Put complex types with array property. :param array: Default value is None. @@ -121,7 +121,7 @@ async def put_valid(self, array: Optional[List[str]] = None, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -169,7 +169,7 @@ async def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -202,7 +202,7 @@ async def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: return deserialized # type: ignore @distributed_trace_async - async def put_empty(self, array: Optional[List[str]] = None, **kwargs: Any) -> None: + async def put_empty(self, array: Optional[list[str]] = None, **kwargs: Any) -> None: """Put complex types with array property which is empty. :param array: Default value is None. @@ -217,7 +217,7 @@ async def put_empty(self, array: Optional[List[str]] = None, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -265,7 +265,7 @@ async def get_not_provided(self, **kwargs: Any) -> _models.ArrayWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py index 0e81a30817c..683f84e18d9 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_basic_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -37,7 +37,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class BasicOperations: @@ -75,7 +75,7 @@ async def get_valid(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -156,7 +156,7 @@ async def put_valid(self, complex_body: Union[_models.Basic, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -212,7 +212,7 @@ async def get_invalid(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -258,7 +258,7 @@ async def get_empty(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -304,7 +304,7 @@ async def get_null(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -350,7 +350,7 @@ async def get_not_provided(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py index 1363f2c976a..5a05bcbde5d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_dictionary_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -36,7 +36,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DictionaryOperations: @@ -74,7 +74,7 @@ async def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -107,7 +107,7 @@ async def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: return deserialized # type: ignore @distributed_trace_async - async def put_valid(self, default_program: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: + async def put_valid(self, default_program: Optional[dict[str, str]] = None, **kwargs: Any) -> None: """Put complex types with dictionary property. :param default_program: Dictionary of :code:``. Default value is None. @@ -122,7 +122,7 @@ async def put_valid(self, default_program: Optional[Dict[str, str]] = None, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -170,7 +170,7 @@ async def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -203,7 +203,7 @@ async def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: return deserialized # type: ignore @distributed_trace_async - async def put_empty(self, default_program: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: + async def put_empty(self, default_program: Optional[dict[str, str]] = None, **kwargs: Any) -> None: """Put complex types with dictionary property which is empty. :param default_program: Dictionary of :code:``. Default value is None. @@ -218,7 +218,7 @@ async def put_empty(self, default_program: Optional[Dict[str, str]] = None, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -266,7 +266,7 @@ async def get_null(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -312,7 +312,7 @@ async def get_not_provided(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py index f437585e62d..be32179664a 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_flattencomplex_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FlattencomplexOperations: @@ -66,7 +66,7 @@ async def get_valid(self, **kwargs: Any) -> _models.MyBaseType: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py index 27b41b64878..3313b99623c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_inheritance_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -30,7 +30,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class InheritanceOperations: @@ -68,7 +68,7 @@ async def get_valid(self, **kwargs: Any) -> _models.Siamese: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -155,7 +155,7 @@ async def put_valid(self, complex_body: Union[_models.Siamese, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py index ea837407a76..a58303a431e 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphicrecursive_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -30,7 +30,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PolymorphicrecursiveOperations: @@ -68,7 +68,7 @@ async def get_valid(self, **kwargs: Any) -> _models.Fish: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -304,7 +304,7 @@ async def put_valid(self, complex_body: Union[_models.Fish, IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py index 8cefdb9f351..f0bbbc76767 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_polymorphism_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -40,7 +40,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PolymorphismOperations: @@ -78,7 +78,7 @@ async def get_valid(self, **kwargs: Any) -> _models.Fish: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -254,7 +254,7 @@ async def put_valid(self, complex_body: Union[_models.Fish, IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -308,7 +308,7 @@ async def get_dot_syntax(self, **kwargs: Any) -> _models.DotFish: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -356,7 +356,7 @@ async def get_composed_with_discriminator(self, **kwargs: Any) -> _models.DotFis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -404,7 +404,7 @@ async def get_composed_without_discriminator(self, **kwargs: Any) -> _models.Dot 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -451,7 +451,7 @@ async def get_complicated(self, **kwargs: Any) -> _models.Salmon: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -534,7 +534,7 @@ async def put_complicated(self, complex_body: Union[_models.Salmon, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -624,7 +624,7 @@ async def put_missing_discriminator( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -797,7 +797,7 @@ async def put_valid_missing_required(self, complex_body: Union[_models.Fish, IO[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py index 813ed2a29a0..62eb9265c14 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_primitive_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -55,7 +55,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PrimitiveOperations: # pylint: disable=too-many-public-methods @@ -93,7 +93,7 @@ async def get_int(self, **kwargs: Any) -> _models.IntWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -172,7 +172,7 @@ async def put_int(self, complex_body: Union[_models.IntWrapper, IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -226,7 +226,7 @@ async def get_long(self, **kwargs: Any) -> _models.LongWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -305,7 +305,7 @@ async def put_long(self, complex_body: Union[_models.LongWrapper, IO[bytes]], ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -359,7 +359,7 @@ async def get_float(self, **kwargs: Any) -> _models.FloatWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -440,7 +440,7 @@ async def put_float(self, complex_body: Union[_models.FloatWrapper, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -494,7 +494,7 @@ async def get_double(self, **kwargs: Any) -> _models.DoubleWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -578,7 +578,7 @@ async def put_double(self, complex_body: Union[_models.DoubleWrapper, IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -632,7 +632,7 @@ async def get_bool(self, **kwargs: Any) -> _models.BooleanWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -711,7 +711,7 @@ async def put_bool(self, complex_body: Union[_models.BooleanWrapper, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -765,7 +765,7 @@ async def get_string(self, **kwargs: Any) -> _models.StringWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -846,7 +846,7 @@ async def put_string(self, complex_body: Union[_models.StringWrapper, IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -900,7 +900,7 @@ async def get_date(self, **kwargs: Any) -> _models.DateWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -979,7 +979,7 @@ async def put_date(self, complex_body: Union[_models.DateWrapper, IO[bytes]], ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1033,7 +1033,7 @@ async def get_date_time(self, **kwargs: Any) -> _models.DatetimeWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1116,7 +1116,7 @@ async def put_date_time(self, complex_body: Union[_models.DatetimeWrapper, IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1170,7 +1170,7 @@ async def get_date_time_rfc1123(self, **kwargs: Any) -> _models.Datetimerfc1123W 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1255,7 +1255,7 @@ async def put_date_time_rfc1123( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1309,7 +1309,7 @@ async def get_duration(self, **kwargs: Any) -> _models.DurationWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1357,7 +1357,7 @@ async def put_duration(self, field: Optional[datetime.timedelta] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1405,7 +1405,7 @@ async def get_byte(self, **kwargs: Any) -> _models.ByteWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1453,7 +1453,7 @@ async def put_byte(self, field: Optional[bytes] = None, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py index fcb2d940424..6077b5b74f7 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/aio/operations/_readonlyproperty_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ReadonlypropertyOperations: @@ -67,7 +67,7 @@ async def get_valid(self, **kwargs: Any) -> _models.ReadonlyObj: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -115,7 +115,7 @@ async def put_valid(self, size: Optional[int] = None, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py index e83ced1bebd..b0a3a1dc9d9 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/models/_models_py3.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- import datetime -from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union import msrest.serialization @@ -27,7 +27,7 @@ class ArrayWrapper(msrest.serialization.Model): "array": {"key": "array", "type": "[str]"}, } - def __init__(self, *, array: Optional[List[str]] = None, **kwargs: Any) -> None: + def __init__(self, *, array: Optional[list[str]] = None, **kwargs: Any) -> None: """ :keyword array: :paramtype array: list[str] @@ -181,7 +181,7 @@ def __init__( id: Optional[int] = None, # pylint: disable=redefined-builtin name: Optional[str] = None, color: Optional[str] = None, - hates: Optional[List["_models.Dog"]] = None, + hates: Optional[list["_models.Dog"]] = None, **kwargs: Any ) -> None: """ @@ -236,7 +236,7 @@ def __init__( *, length: float, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, **kwargs: Any ) -> None: """ @@ -301,7 +301,7 @@ def __init__( length: float, birthday: datetime.datetime, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, age: Optional[int] = None, **kwargs: Any ) -> None: @@ -363,7 +363,7 @@ def __init__( length: float, birthday: datetime.datetime, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, age: Optional[int] = None, **kwargs: Any ) -> None: @@ -478,7 +478,7 @@ class DictionaryWrapper(msrest.serialization.Model): "default_program": {"key": "defaultProgram", "type": "{str}"}, } - def __init__(self, *, default_program: Optional[Dict[str, str]] = None, **kwargs: Any) -> None: + def __init__(self, *, default_program: Optional[dict[str, str]] = None, **kwargs: Any) -> None: """ :keyword default_program: Dictionary of :code:``. :paramtype default_program: dict[str, str] @@ -583,9 +583,9 @@ def __init__( self, *, sample_salmon: Optional["_models.DotSalmon"] = None, - salmons: Optional[List["_models.DotSalmon"]] = None, + salmons: Optional[list["_models.DotSalmon"]] = None, sample_fish: Optional["_models.DotFish"] = None, - fishes: Optional[List["_models.DotFish"]] = None, + fishes: Optional[list["_models.DotFish"]] = None, **kwargs: Any ) -> None: """ @@ -816,7 +816,7 @@ def __init__( length: float, birthday: datetime.datetime, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, age: Optional[int] = None, jawsize: Optional[int] = None, color: Union[str, "_models.GoblinSharkColor"] = "gray", @@ -1057,7 +1057,7 @@ def __init__( *, length: float, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, location: Optional[str] = None, iswild: Optional[bool] = None, **kwargs: Any @@ -1123,7 +1123,7 @@ def __init__( length: float, birthday: datetime.datetime, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, age: Optional[int] = None, picture: Optional[bytes] = None, **kwargs: Any @@ -1176,7 +1176,7 @@ def __init__( id: Optional[int] = None, # pylint: disable=redefined-builtin name: Optional[str] = None, color: Optional[str] = None, - hates: Optional[List["_models.Dog"]] = None, + hates: Optional[list["_models.Dog"]] = None, breed: Optional[str] = None, **kwargs: Any ) -> None: @@ -1241,10 +1241,10 @@ def __init__( *, length: float, species: Optional[str] = None, - siblings: Optional[List["_models.Fish"]] = None, + siblings: Optional[list["_models.Fish"]] = None, location: Optional[str] = None, iswild: Optional[bool] = None, - additional_properties: Optional[Dict[str, Any]] = None, + additional_properties: Optional[dict[str, Any]] = None, college_degree: Optional[str] = None, **kwargs: Any ) -> None: diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py index a3ec5a87fe7..b9ac5353f47 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_array_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -144,7 +144,7 @@ def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -178,7 +178,7 @@ def get_valid(self, **kwargs: Any) -> _models.ArrayWrapper: @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements - self, array: Optional[List[str]] = None, **kwargs: Any + self, array: Optional[list[str]] = None, **kwargs: Any ) -> None: """Put complex types with array property. @@ -194,7 +194,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -242,7 +242,7 @@ def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ def get_empty(self, **kwargs: Any) -> _models.ArrayWrapper: @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array: Optional[List[str]] = None, **kwargs: Any + self, array: Optional[list[str]] = None, **kwargs: Any ) -> None: """Put complex types with array property which is empty. @@ -292,7 +292,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -340,7 +340,7 @@ def get_not_provided(self, **kwargs: Any) -> _models.ArrayWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py index a6c5f3252d5..65ddbe7a5cc 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_basic_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -161,7 +161,7 @@ def get_valid(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -240,7 +240,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -296,7 +296,7 @@ def get_invalid(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -342,7 +342,7 @@ def get_empty(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -388,7 +388,7 @@ def get_null(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -434,7 +434,7 @@ def get_not_provided(self, **kwargs: Any) -> _models.Basic: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py index 2cedfee7246..1b0d76a0e0b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_dictionary_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -158,7 +158,7 @@ def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -192,7 +192,7 @@ def get_valid(self, **kwargs: Any) -> _models.DictionaryWrapper: @distributed_trace def put_valid( # pylint: disable=inconsistent-return-statements - self, default_program: Optional[Dict[str, str]] = None, **kwargs: Any + self, default_program: Optional[dict[str, str]] = None, **kwargs: Any ) -> None: """Put complex types with dictionary property. @@ -208,7 +208,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -256,7 +256,7 @@ def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -290,7 +290,7 @@ def get_empty(self, **kwargs: Any) -> _models.DictionaryWrapper: @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, default_program: Optional[Dict[str, str]] = None, **kwargs: Any + self, default_program: Optional[dict[str, str]] = None, **kwargs: Any ) -> None: """Put complex types with dictionary property which is empty. @@ -306,7 +306,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -354,7 +354,7 @@ def get_null(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -400,7 +400,7 @@ def get_not_provided(self, **kwargs: Any) -> _models.DictionaryWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py index 9e899cb8441..317d3a56e3b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_flattencomplex_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -82,7 +82,7 @@ def get_valid(self, **kwargs: Any) -> _models.MyBaseType: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py index 72502537800..dded15e89fd 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_inheritance_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -100,7 +100,7 @@ def get_valid(self, **kwargs: Any) -> _models.Siamese: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -187,7 +187,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py index 366868a40b5..5c10f5d149d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphicrecursive_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -100,7 +100,7 @@ def get_valid(self, **kwargs: Any) -> _models.Fish: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -334,7 +334,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py index 56cc473109f..af6633cf679 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_polymorphism_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -207,7 +207,7 @@ def get_valid(self, **kwargs: Any) -> _models.Fish: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -381,7 +381,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -435,7 +435,7 @@ def get_dot_syntax(self, **kwargs: Any) -> _models.DotFish: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -483,7 +483,7 @@ def get_composed_with_discriminator(self, **kwargs: Any) -> _models.DotFishMarke 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -531,7 +531,7 @@ def get_composed_without_discriminator(self, **kwargs: Any) -> _models.DotFishMa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -578,7 +578,7 @@ def get_complicated(self, **kwargs: Any) -> _models.Salmon: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -663,7 +663,7 @@ def put_complicated( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -753,7 +753,7 @@ def put_missing_discriminator( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -928,7 +928,7 @@ def put_valid_missing_required( # pylint: disable=inconsistent-return-statement 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py index d585d505d2e..a877a8da84d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_primitive_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -31,7 +31,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -412,7 +412,7 @@ def get_int(self, **kwargs: Any) -> _models.IntWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -493,7 +493,7 @@ def put_int( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -547,7 +547,7 @@ def get_long(self, **kwargs: Any) -> _models.LongWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -628,7 +628,7 @@ def put_long( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -682,7 +682,7 @@ def get_float(self, **kwargs: Any) -> _models.FloatWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -763,7 +763,7 @@ def put_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -817,7 +817,7 @@ def get_double(self, **kwargs: Any) -> _models.DoubleWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -901,7 +901,7 @@ def put_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -955,7 +955,7 @@ def get_bool(self, **kwargs: Any) -> _models.BooleanWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1036,7 +1036,7 @@ def put_bool( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1090,7 +1090,7 @@ def get_string(self, **kwargs: Any) -> _models.StringWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1171,7 +1171,7 @@ def put_string( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1225,7 +1225,7 @@ def get_date(self, **kwargs: Any) -> _models.DateWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1306,7 +1306,7 @@ def put_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1360,7 +1360,7 @@ def get_date_time(self, **kwargs: Any) -> _models.DatetimeWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1443,7 +1443,7 @@ def put_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1497,7 +1497,7 @@ def get_date_time_rfc1123(self, **kwargs: Any) -> _models.Datetimerfc1123Wrapper 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1582,7 +1582,7 @@ def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1636,7 +1636,7 @@ def get_duration(self, **kwargs: Any) -> _models.DurationWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1686,7 +1686,7 @@ def put_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1734,7 +1734,7 @@ def get_byte(self, **kwargs: Any) -> _models.ByteWrapper: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1784,7 +1784,7 @@ def put_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py index b900f5f46df..1a7f8b95913 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyComplex/bodycomplex/operations/_readonlyproperty_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestComplexTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -99,7 +99,7 @@ def get_valid(self, **kwargs: Any) -> _models.ReadonlyObj: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -149,7 +149,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py index 3614b01aab1..73a8f99f6af 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/aio/operations/_date_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -38,7 +38,7 @@ from .._configuration import AutoRestDateTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DateOperations: @@ -74,7 +74,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -120,7 +120,7 @@ async def get_invalid_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -166,7 +166,7 @@ async def get_overflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -212,7 +212,7 @@ async def get_underflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -260,7 +260,7 @@ async def put_max_date(self, date_body: datetime.date, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -307,7 +307,7 @@ async def get_max_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -355,7 +355,7 @@ async def put_min_date(self, date_body: datetime.date, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -402,7 +402,7 @@ async def get_min_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/operations/_date_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/operations/_date_operations.py index 64c4888b995..9c415e9a53f 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/operations/_date_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDate/bodydate/operations/_date_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -185,7 +185,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ def get_invalid_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -277,7 +277,7 @@ def get_overflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -323,7 +323,7 @@ def get_underflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -373,7 +373,7 @@ def put_max_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -420,7 +420,7 @@ def get_max_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -470,7 +470,7 @@ def put_min_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -517,7 +517,7 @@ def get_min_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py index 61a9ae6fd5f..305a7d2da3d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/aio/operations/_datetime_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -53,7 +53,7 @@ from .._configuration import AutoRestDateTimeTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DatetimeOperations: # pylint: disable=too-many-public-methods @@ -91,7 +91,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -137,7 +137,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -183,7 +183,7 @@ async def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -229,7 +229,7 @@ async def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -277,7 +277,7 @@ async def put_utc_max_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -329,7 +329,7 @@ async def put_utc_max_date_time7_digits(self, datetime_body: datetime.datetime, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -376,7 +376,7 @@ async def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -422,7 +422,7 @@ async def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -471,7 +471,7 @@ async def get_utc_uppercase_max_date_time7_digits(self, **kwargs: Any) -> dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -519,7 +519,7 @@ async def put_local_positive_offset_max_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -568,7 +568,7 @@ async def get_local_positive_offset_lowercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -616,7 +616,7 @@ async def get_local_positive_offset_uppercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -664,7 +664,7 @@ async def put_local_negative_offset_max_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -713,7 +713,7 @@ async def get_local_negative_offset_uppercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -761,7 +761,7 @@ async def get_local_negative_offset_lowercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -809,7 +809,7 @@ async def put_utc_min_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -856,7 +856,7 @@ async def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -904,7 +904,7 @@ async def put_local_positive_offset_min_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -951,7 +951,7 @@ async def get_local_positive_offset_min_date_time(self, **kwargs: Any) -> dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -999,7 +999,7 @@ async def put_local_negative_offset_min_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1046,7 +1046,7 @@ async def get_local_negative_offset_min_date_time(self, **kwargs: Any) -> dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1092,7 +1092,7 @@ async def get_local_no_offset_min_date_time(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/operations/_datetime_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/operations/_datetime_operations.py index 1eb59b2fd54..11dc5e8baed 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/operations/_datetime_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTime/bodydatetime/operations/_datetime_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -423,7 +423,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -469,7 +469,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -515,7 +515,7 @@ def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -561,7 +561,7 @@ def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -611,7 +611,7 @@ def put_utc_max_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -665,7 +665,7 @@ def put_utc_max_date_time7_digits( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -712,7 +712,7 @@ def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -758,7 +758,7 @@ def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -807,7 +807,7 @@ def get_utc_uppercase_max_date_time7_digits(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -857,7 +857,7 @@ def put_local_positive_offset_max_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -906,7 +906,7 @@ def get_local_positive_offset_lowercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -954,7 +954,7 @@ def get_local_positive_offset_uppercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1004,7 +1004,7 @@ def put_local_negative_offset_max_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1053,7 +1053,7 @@ def get_local_negative_offset_uppercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1101,7 +1101,7 @@ def get_local_negative_offset_lowercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1151,7 +1151,7 @@ def put_utc_min_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1198,7 +1198,7 @@ def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1248,7 +1248,7 @@ def put_local_positive_offset_min_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1295,7 +1295,7 @@ def get_local_positive_offset_min_date_time(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1345,7 +1345,7 @@ def put_local_negative_offset_min_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1392,7 +1392,7 @@ def get_local_negative_offset_min_date_time(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1438,7 +1438,7 @@ def get_local_no_offset_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py index 137ab82ee1a..a52abef934f 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/aio/operations/_datetimerfc1123_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -39,7 +39,7 @@ from .._configuration import AutoRestRFC1123DateTimeTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class Datetimerfc1123Operations: @@ -77,7 +77,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -123,7 +123,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -169,7 +169,7 @@ async def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -215,7 +215,7 @@ async def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -263,7 +263,7 @@ async def put_utc_max_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ async def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -356,7 +356,7 @@ async def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -404,7 +404,7 @@ async def put_utc_min_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -451,7 +451,7 @@ async def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/operations/_datetimerfc1123_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/operations/_datetimerfc1123_operations.py index 257b844e34c..0b03f5af2d0 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/operations/_datetimerfc1123_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDateTimeRfc1123/bodydatetimerfc1123/operations/_datetimerfc1123_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -201,7 +201,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -247,7 +247,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -293,7 +293,7 @@ def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -339,7 +339,7 @@ def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -389,7 +389,7 @@ def put_utc_max_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -436,7 +436,7 @@ def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -482,7 +482,7 @@ def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -532,7 +532,7 @@ def put_utc_min_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -579,7 +579,7 @@ def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py index 887b3200735..bb9d1815c11 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/aio/operations/_dictionary_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -97,7 +97,7 @@ from .._configuration import AutoRestSwaggerBATDictionaryServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DictionaryOperations: # pylint: disable=too-many-public-methods @@ -122,7 +122,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> Dict[str, int]: + async def get_null(self, **kwargs: Any) -> dict[str, int]: """Get null dictionary value. :return: dict mapping str to int or the result of cls(response) @@ -135,12 +135,12 @@ async def get_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -168,7 +168,7 @@ async def get_null(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> Dict[str, int]: + async def get_empty(self, **kwargs: Any) -> dict[str, int]: """Get empty dictionary value {}. :return: dict mapping str to int or the result of cls(response) @@ -181,12 +181,12 @@ async def get_empty(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -215,7 +215,7 @@ async def get_empty(self, **kwargs: Any) -> Dict[str, int]: @overload async def put_empty( - self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {}. @@ -244,7 +244,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {}. :param array_body: Is either a {str: str} type or a IO[bytes] type. Required. @@ -259,7 +259,7 @@ async def put_empty(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -300,7 +300,7 @@ async def put_empty(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_null_value(self, **kwargs: Any) -> Dict[str, str]: + async def get_null_value(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null value. :return: dict mapping str to str or the result of cls(response) @@ -313,12 +313,12 @@ async def get_null_value(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_null_value_request( headers=_headers, @@ -346,7 +346,7 @@ async def get_null_value(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace_async - async def get_null_key(self, **kwargs: Any) -> Dict[str, str]: + async def get_null_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null key. :return: dict mapping str to str or the result of cls(response) @@ -359,12 +359,12 @@ async def get_null_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_null_key_request( headers=_headers, @@ -392,7 +392,7 @@ async def get_null_key(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace_async - async def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: + async def get_empty_string_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with key as empty string. :return: dict mapping str to str or the result of cls(response) @@ -405,12 +405,12 @@ async def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_empty_string_key_request( headers=_headers, @@ -438,7 +438,7 @@ async def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> Dict[str, str]: + async def get_invalid(self, **kwargs: Any) -> dict[str, str]: """Get invalid Dictionary value. :return: dict mapping str to str or the result of cls(response) @@ -451,12 +451,12 @@ async def get_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -484,7 +484,7 @@ async def get_invalid(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }. :return: dict mapping str to bool or the result of cls(response) @@ -497,12 +497,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -531,7 +531,7 @@ async def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: @overload async def put_boolean_tfft( - self, array_body: Dict[str, bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. @@ -562,7 +562,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[dict[str, bool], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. :param array_body: Is either a {str: bool} type or a IO[bytes] type. Required. @@ -577,7 +577,7 @@ async def put_boolean_tfft(self, array_body: Union[Dict[str, bool], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -618,7 +618,7 @@ async def put_boolean_tfft(self, array_body: Union[Dict[str, bool], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": null, "2": false }. :return: dict mapping str to bool or the result of cls(response) @@ -631,12 +631,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -664,7 +664,7 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: return deserialized # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value '{"0": true, "1": "boolean", "2": false}'. :return: dict mapping str to bool or the result of cls(response) @@ -677,12 +677,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -710,7 +710,7 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: return deserialized # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: + async def get_integer_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int or the result of cls(response) @@ -723,12 +723,12 @@ async def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -757,7 +757,7 @@ async def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: @overload async def put_integer_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -788,7 +788,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. :param array_body: Is either a {str: int} type or a IO[bytes] type. Required. @@ -803,7 +803,7 @@ async def put_integer_valid(self, array_body: Union[Dict[str, int], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -844,7 +844,7 @@ async def put_integer_valid(self, array_body: Union[Dict[str, int], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + async def get_int_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -857,12 +857,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -890,7 +890,7 @@ async def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + async def get_int_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -903,12 +903,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -936,7 +936,7 @@ async def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: + async def get_long_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int or the result of cls(response) @@ -949,12 +949,12 @@ async def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -983,7 +983,7 @@ async def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: @overload async def put_long_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1014,7 +1014,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. :param array_body: Is either a {str: int} type or a IO[bytes] type. Required. @@ -1029,7 +1029,7 @@ async def put_long_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1070,7 +1070,7 @@ async def put_long_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **k return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + async def get_long_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -1083,12 +1083,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -1116,7 +1116,7 @@ async def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + async def get_long_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -1129,12 +1129,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -1162,7 +1162,7 @@ async def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: + async def get_float_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -1175,12 +1175,12 @@ async def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -1209,7 +1209,7 @@ async def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: @overload async def put_float_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -1240,7 +1240,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :param array_body: Is either a {str: float} type or a IO[bytes] type. Required. @@ -1255,7 +1255,7 @@ async def put_float_valid(self, array_body: Union[Dict[str, float], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1296,7 +1296,7 @@ async def put_float_valid(self, array_body: Union[Dict[str, float], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + async def get_float_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -1309,12 +1309,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -1342,7 +1342,7 @@ async def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + async def get_float_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float or the result of cls(response) @@ -1355,12 +1355,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -1388,7 +1388,7 @@ async def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: + async def get_double_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -1401,12 +1401,12 @@ async def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -1435,7 +1435,7 @@ async def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: @overload async def put_double_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -1466,7 +1466,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :param array_body: Is either a {str: float} type or a IO[bytes] type. Required. @@ -1481,7 +1481,7 @@ async def put_double_valid(self, array_body: Union[Dict[str, float], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1522,7 +1522,7 @@ async def put_double_valid(self, array_body: Union[Dict[str, float], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + async def get_double_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -1535,12 +1535,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -1568,7 +1568,7 @@ async def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + async def get_double_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float or the result of cls(response) @@ -1581,12 +1581,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -1614,7 +1614,7 @@ async def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: + async def get_string_valid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. :return: dict mapping str to str or the result of cls(response) @@ -1627,12 +1627,12 @@ async def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -1661,7 +1661,7 @@ async def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: @overload async def put_string_valid( - self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. @@ -1692,7 +1692,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. :param array_body: Is either a {str: str} type or a IO[bytes] type. Required. @@ -1707,7 +1707,7 @@ async def put_string_valid(self, array_body: Union[Dict[str, str], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1748,7 +1748,7 @@ async def put_string_valid(self, array_body: Union[Dict[str, str], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: + async def get_string_with_null(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": null, "2": "foo2"}. :return: dict mapping str to str or the result of cls(response) @@ -1761,12 +1761,12 @@ async def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -1794,7 +1794,7 @@ async def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: + async def get_string_with_invalid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": 123, "2": "foo2"}. :return: dict mapping str to str or the result of cls(response) @@ -1807,12 +1807,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -1840,7 +1840,7 @@ async def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> dict[str, datetime.date]: """Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. :return: dict mapping str to date or the result of cls(response) @@ -1853,12 +1853,12 @@ async def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -1887,7 +1887,7 @@ async def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: @overload async def put_date_valid( - self, array_body: Dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. @@ -1918,7 +1918,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[Dict[str, datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[dict[str, datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. :param array_body: Is either a {str: datetime.date} type or a IO[bytes] type. Required. @@ -1933,7 +1933,7 @@ async def put_date_valid(self, array_body: Union[Dict[str, datetime.date], IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1974,7 +1974,7 @@ async def put_date_valid(self, array_body: Union[Dict[str, datetime.date], IO[by return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}. :return: dict mapping str to date or the result of cls(response) @@ -1987,12 +1987,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -2020,7 +2020,7 @@ async def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date] return deserialized # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2011-03-22", "1": "date"}. :return: dict mapping str to date or the result of cls(response) @@ -2033,12 +2033,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -2066,7 +2066,7 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date return deserialized # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2080,12 +2080,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetim 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -2114,7 +2114,7 @@ async def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetim @overload async def put_date_time_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2148,7 +2148,7 @@ async def put_date_time_valid( @distributed_trace_async async def put_date_time_valid( - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2165,7 +2165,7 @@ async def put_date_time_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2206,7 +2206,7 @@ async def put_date_time_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": null}. :return: dict mapping str to datetime or the result of cls(response) @@ -2219,12 +2219,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -2252,7 +2252,7 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime. return deserialized # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}. :return: dict mapping str to datetime or the result of cls(response) @@ -2265,12 +2265,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -2298,7 +2298,7 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime return deserialized # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time-rfc1123 dictionary value {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -2312,12 +2312,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -2346,7 +2346,7 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime @overload async def put_date_time_rfc1123_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -2380,7 +2380,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -2397,7 +2397,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2438,7 +2438,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> dict[str, datetime.timedelta]: """Get duration dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. :return: dict mapping str to timedelta or the result of cls(response) @@ -2451,12 +2451,12 @@ async def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -2485,7 +2485,7 @@ async def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelt @overload async def put_duration_valid( - self, array_body: Dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -2517,7 +2517,7 @@ async def put_duration_valid( @distributed_trace_async async def put_duration_valid( - self, array_body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -2533,7 +2533,7 @@ async def put_duration_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2574,7 +2574,7 @@ async def put_duration_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: + async def get_byte_valid(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64. @@ -2588,12 +2588,12 @@ async def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -2622,7 +2622,7 @@ async def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: @overload async def put_byte_valid( - self, array_body: Dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -2655,7 +2655,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[Dict[str, bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[dict[str, bytes], IO[bytes]], **kwargs: Any) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -2671,7 +2671,7 @@ async def put_byte_valid(self, array_body: Union[Dict[str, bytes], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2712,7 +2712,7 @@ async def put_byte_valid(self, array_body: Union[Dict[str, bytes], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded. @@ -2726,12 +2726,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -2759,7 +2759,7 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: + async def get_base64_url(self, **kwargs: Any) -> dict[str, bytes]: """Get base64url dictionary value {"0": "a string that gets encoded with base64url", "1": "test string", "2": "Lorem ipsum"}. @@ -2773,12 +2773,12 @@ async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -2806,7 +2806,7 @@ async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, _models.Widget]]: + async def get_complex_null(self, **kwargs: Any) -> Optional[dict[str, _models.Widget]]: """Get dictionary of complex type null value. :return: dict mapping str to Widget or None or the result of cls(response) @@ -2819,12 +2819,12 @@ async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, _models.Wi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, _models.Widget]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, _models.Widget]]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -2852,7 +2852,7 @@ async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, _models.Wi return deserialized # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: + async def get_complex_empty(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get empty dictionary of complex type {}. :return: dict mapping str to Widget or the result of cls(response) @@ -2865,12 +2865,12 @@ async def get_complex_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -2898,7 +2898,7 @@ async def get_complex_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, _models.Widget]: + async def get_complex_item_null(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}. @@ -2912,12 +2912,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, _models.Widget 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -2945,7 +2945,7 @@ async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, _models.Widget return deserialized # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: + async def get_complex_item_empty(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}. @@ -2959,12 +2959,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, _models.Widge 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -2992,7 +2992,7 @@ async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, _models.Widge return deserialized # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> Dict[str, _models.Widget]: + async def get_complex_valid(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3006,12 +3006,12 @@ async def get_complex_valid(self, **kwargs: Any) -> Dict[str, _models.Widget]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -3040,7 +3040,7 @@ async def get_complex_valid(self, **kwargs: Any) -> Dict[str, _models.Widget]: @overload async def put_complex_valid( - self, array_body: Dict[str, _models.Widget], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, _models.Widget], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3073,7 +3073,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[Dict[str, _models.Widget], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[dict[str, _models.Widget], IO[bytes]], **kwargs: Any) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3089,7 +3089,7 @@ async def put_complex_valid(self, array_body: Union[Dict[str, _models.Widget], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3130,7 +3130,7 @@ async def put_complex_valid(self, array_body: Union[Dict[str, _models.Widget], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: + async def get_array_null(self, **kwargs: Any) -> Optional[dict[str, list[str]]]: """Get a null array. :return: dict mapping str to list of str or None or the result of cls(response) @@ -3143,12 +3143,12 @@ async def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, List[str]]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, list[str]]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -3176,7 +3176,7 @@ async def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an empty dictionary {}. :return: dict mapping str to list of str or the result of cls(response) @@ -3189,12 +3189,12 @@ async def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -3222,7 +3222,7 @@ async def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> dict[str, list[str]]: """Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}. :return: dict mapping str to list of str or the result of cls(response) @@ -3235,12 +3235,12 @@ async def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -3268,7 +3268,7 @@ async def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}. :return: dict mapping str to list of str or the result of cls(response) @@ -3281,12 +3281,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -3314,7 +3314,7 @@ async def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: return deserialized # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_valid(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -3328,12 +3328,12 @@ async def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -3362,7 +3362,7 @@ async def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: @overload async def put_array_valid( - self, array_body: Dict[str, List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -3395,7 +3395,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[Dict[str, List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[dict[str, list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -3411,7 +3411,7 @@ async def put_array_valid(self, array_body: Union[Dict[str, List[str]], IO[bytes 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3452,7 +3452,7 @@ async def put_array_valid(self, array_body: Union[Dict[str, List[str]], IO[bytes return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries with value null. :return: dict mapping str to dict mapping str to str or the result of cls(response) @@ -3465,12 +3465,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -3498,7 +3498,7 @@ async def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {}. :return: dict mapping str to dict mapping str to str or the result of cls(response) @@ -3511,12 +3511,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -3544,7 +3544,7 @@ async def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]] return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -3558,12 +3558,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -3591,7 +3591,7 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, s return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -3605,12 +3605,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -3638,7 +3638,7 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, return deserialized # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -3653,12 +3653,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -3687,7 +3687,7 @@ async def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]] @overload async def put_dictionary_valid( - self, array_body: Dict[str, Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -3723,7 +3723,7 @@ async def put_dictionary_valid( @distributed_trace_async async def put_dictionary_valid( - self, array_body: Union[Dict[str, Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -3741,7 +3741,7 @@ async def put_dictionary_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py index d92a71de33e..a0010bb6c61 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDictionary/bodydictionary/operations/_dictionary_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1013,7 +1013,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> Dict[str, int]: + def get_null(self, **kwargs: Any) -> dict[str, int]: """Get null dictionary value. :return: dict mapping str to int or the result of cls(response) @@ -1026,12 +1026,12 @@ def get_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_null_request( headers=_headers, @@ -1059,7 +1059,7 @@ def get_null(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> Dict[str, int]: + def get_empty(self, **kwargs: Any) -> dict[str, int]: """Get empty dictionary value {}. :return: dict mapping str to int or the result of cls(response) @@ -1072,12 +1072,12 @@ def get_empty(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_empty_request( headers=_headers, @@ -1105,7 +1105,7 @@ def get_empty(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @overload - def put_empty(self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set dictionary value empty {}. :param array_body: Required. @@ -1134,7 +1134,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {}. @@ -1150,7 +1150,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1191,7 +1191,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_null_value(self, **kwargs: Any) -> Dict[str, str]: + def get_null_value(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null value. :return: dict mapping str to str or the result of cls(response) @@ -1204,12 +1204,12 @@ def get_null_value(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_null_value_request( headers=_headers, @@ -1237,7 +1237,7 @@ def get_null_value(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace - def get_null_key(self, **kwargs: Any) -> Dict[str, str]: + def get_null_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null key. :return: dict mapping str to str or the result of cls(response) @@ -1250,12 +1250,12 @@ def get_null_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_null_key_request( headers=_headers, @@ -1283,7 +1283,7 @@ def get_null_key(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace - def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: + def get_empty_string_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with key as empty string. :return: dict mapping str to str or the result of cls(response) @@ -1296,12 +1296,12 @@ def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_empty_string_key_request( headers=_headers, @@ -1329,7 +1329,7 @@ def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> Dict[str, str]: + def get_invalid(self, **kwargs: Any) -> dict[str, str]: """Get invalid Dictionary value. :return: dict mapping str to str or the result of cls(response) @@ -1342,12 +1342,12 @@ def get_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_invalid_request( headers=_headers, @@ -1375,7 +1375,7 @@ def get_invalid(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: + def get_boolean_tfft(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }. :return: dict mapping str to bool or the result of cls(response) @@ -1388,12 +1388,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_get_boolean_tfft_request( headers=_headers, @@ -1422,7 +1422,7 @@ def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: @overload def put_boolean_tfft( - self, array_body: Dict[str, bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. @@ -1452,7 +1452,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, bool], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. @@ -1468,7 +1468,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1509,7 +1509,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": null, "2": false }. :return: dict mapping str to bool or the result of cls(response) @@ -1522,12 +1522,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_null_request( headers=_headers, @@ -1555,7 +1555,7 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: return deserialized # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value '{"0": true, "1": "boolean", "2": false}'. :return: dict mapping str to bool or the result of cls(response) @@ -1568,12 +1568,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_get_boolean_invalid_string_request( headers=_headers, @@ -1601,7 +1601,7 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: return deserialized # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: + def get_integer_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int or the result of cls(response) @@ -1614,12 +1614,12 @@ def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_integer_valid_request( headers=_headers, @@ -1648,7 +1648,7 @@ def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: @overload def put_integer_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1680,7 +1680,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1696,7 +1696,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1737,7 +1737,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + def get_int_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -1750,12 +1750,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_null_request( headers=_headers, @@ -1783,7 +1783,7 @@ def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + def get_int_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -1796,12 +1796,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_int_invalid_string_request( headers=_headers, @@ -1829,7 +1829,7 @@ def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: + def get_long_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int or the result of cls(response) @@ -1842,12 +1842,12 @@ def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_long_valid_request( headers=_headers, @@ -1876,7 +1876,7 @@ def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: @overload def put_long_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1906,7 +1906,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1922,7 +1922,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1963,7 +1963,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + def get_long_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -1976,12 +1976,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_null_request( headers=_headers, @@ -2009,7 +2009,7 @@ def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + def get_long_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int or the result of cls(response) @@ -2022,12 +2022,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_long_invalid_string_request( headers=_headers, @@ -2055,7 +2055,7 @@ def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: + def get_float_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -2068,12 +2068,12 @@ def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_float_valid_request( headers=_headers, @@ -2102,7 +2102,7 @@ def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: @overload def put_float_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2132,7 +2132,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2148,7 +2148,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2189,7 +2189,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + def get_float_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -2202,12 +2202,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_null_request( headers=_headers, @@ -2235,7 +2235,7 @@ def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + def get_float_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float or the result of cls(response) @@ -2248,12 +2248,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_float_invalid_string_request( headers=_headers, @@ -2281,7 +2281,7 @@ def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: + def get_double_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -2294,12 +2294,12 @@ def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_double_valid_request( headers=_headers, @@ -2328,7 +2328,7 @@ def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: @overload def put_double_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2358,7 +2358,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2374,7 +2374,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2415,7 +2415,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + def get_double_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float or the result of cls(response) @@ -2428,12 +2428,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_null_request( headers=_headers, @@ -2461,7 +2461,7 @@ def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + def get_double_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float or the result of cls(response) @@ -2474,12 +2474,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_get_double_invalid_string_request( headers=_headers, @@ -2507,7 +2507,7 @@ def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: + def get_string_valid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. :return: dict mapping str to str or the result of cls(response) @@ -2520,12 +2520,12 @@ def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_string_valid_request( headers=_headers, @@ -2554,7 +2554,7 @@ def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: @overload def put_string_valid( - self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. @@ -2584,7 +2584,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. @@ -2600,7 +2600,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2641,7 +2641,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: + def get_string_with_null(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": null, "2": "foo2"}. :return: dict mapping str to str or the result of cls(response) @@ -2654,12 +2654,12 @@ def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_string_with_null_request( headers=_headers, @@ -2687,7 +2687,7 @@ def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: + def get_string_with_invalid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": 123, "2": "foo2"}. :return: dict mapping str to str or the result of cls(response) @@ -2700,12 +2700,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_get_string_with_invalid_request( headers=_headers, @@ -2733,7 +2733,7 @@ def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: + def get_date_valid(self, **kwargs: Any) -> dict[str, datetime.date]: """Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. :return: dict mapping str to date or the result of cls(response) @@ -2746,12 +2746,12 @@ def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_valid_request( headers=_headers, @@ -2780,7 +2780,7 @@ def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: @overload def put_date_valid( - self, array_body: Dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. @@ -2810,7 +2810,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. @@ -2826,7 +2826,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2867,7 +2867,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}. :return: dict mapping str to date or the result of cls(response) @@ -2880,12 +2880,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_null_request( headers=_headers, @@ -2913,7 +2913,7 @@ def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2011-03-22", "1": "date"}. :return: dict mapping str to date or the result of cls(response) @@ -2926,12 +2926,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_get_date_invalid_chars_request( headers=_headers, @@ -2959,7 +2959,7 @@ def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: return deserialized # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2973,12 +2973,12 @@ def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_valid_request( headers=_headers, @@ -3007,7 +3007,7 @@ def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: @overload def put_date_time_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -3041,7 +3041,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -3058,7 +3058,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3099,7 +3099,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": null}. :return: dict mapping str to datetime or the result of cls(response) @@ -3112,12 +3112,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_null_request( headers=_headers, @@ -3145,7 +3145,7 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.dateti return deserialized # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}. :return: dict mapping str to datetime or the result of cls(response) @@ -3158,12 +3158,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_invalid_chars_request( headers=_headers, @@ -3191,7 +3191,7 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datet return deserialized # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time-rfc1123 dictionary value {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -3205,12 +3205,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3239,7 +3239,7 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datet @overload def put_date_time_rfc1123_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -3273,7 +3273,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -3290,7 +3290,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3331,7 +3331,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> dict[str, datetime.timedelta]: """Get duration dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. :return: dict mapping str to timedelta or the result of cls(response) @@ -3344,12 +3344,12 @@ def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.timedelta]] = kwargs.pop("cls", None) _request = build_get_duration_valid_request( headers=_headers, @@ -3378,7 +3378,7 @@ def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: @overload def put_duration_valid( - self, array_body: Dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -3410,7 +3410,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -3426,7 +3426,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3467,7 +3467,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: + def get_byte_valid(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64. @@ -3481,12 +3481,12 @@ def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_get_byte_valid_request( headers=_headers, @@ -3515,7 +3515,7 @@ def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: @overload def put_byte_valid( - self, array_body: Dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -3547,7 +3547,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -3564,7 +3564,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3605,7 +3605,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded. @@ -3619,12 +3619,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_get_byte_invalid_null_request( headers=_headers, @@ -3652,7 +3652,7 @@ def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: return deserialized # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: + def get_base64_url(self, **kwargs: Any) -> dict[str, bytes]: """Get base64url dictionary value {"0": "a string that gets encoded with base64url", "1": "test string", "2": "Lorem ipsum"}. @@ -3666,12 +3666,12 @@ def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_get_base64_url_request( headers=_headers, @@ -3699,7 +3699,7 @@ def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: return deserialized # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, _models.Widget]]: + def get_complex_null(self, **kwargs: Any) -> Optional[dict[str, _models.Widget]]: """Get dictionary of complex type null value. :return: dict mapping str to Widget or None or the result of cls(response) @@ -3712,12 +3712,12 @@ def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, _models.Widget]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, _models.Widget]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, _models.Widget]]] = kwargs.pop("cls", None) _request = build_get_complex_null_request( headers=_headers, @@ -3745,7 +3745,7 @@ def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, _models.Widget]] return deserialized # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: + def get_complex_empty(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get empty dictionary of complex type {}. :return: dict mapping str to Widget or the result of cls(response) @@ -3758,12 +3758,12 @@ def get_complex_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_empty_request( headers=_headers, @@ -3791,7 +3791,7 @@ def get_complex_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: return deserialized # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> Dict[str, _models.Widget]: + def get_complex_item_null(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}. @@ -3805,12 +3805,12 @@ def get_complex_item_null(self, **kwargs: Any) -> Dict[str, _models.Widget]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_item_null_request( headers=_headers, @@ -3838,7 +3838,7 @@ def get_complex_item_null(self, **kwargs: Any) -> Dict[str, _models.Widget]: return deserialized # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: + def get_complex_item_empty(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}. @@ -3852,12 +3852,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_item_empty_request( headers=_headers, @@ -3885,7 +3885,7 @@ def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, _models.Widget]: return deserialized # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> Dict[str, _models.Widget]: + def get_complex_valid(self, **kwargs: Any) -> dict[str, _models.Widget]: """Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3899,12 +3899,12 @@ def get_complex_valid(self, **kwargs: Any) -> Dict[str, _models.Widget]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.Widget]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.Widget]] = kwargs.pop("cls", None) _request = build_get_complex_valid_request( headers=_headers, @@ -3933,7 +3933,7 @@ def get_complex_valid(self, **kwargs: Any) -> Dict[str, _models.Widget]: @overload def put_complex_valid( - self, array_body: Dict[str, _models.Widget], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, _models.Widget], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3967,7 +3967,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, _models.Widget], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, _models.Widget], IO[bytes]], **kwargs: Any ) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3984,7 +3984,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4025,7 +4025,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: + def get_array_null(self, **kwargs: Any) -> Optional[dict[str, list[str]]]: """Get a null array. :return: dict mapping str to list of str or None or the result of cls(response) @@ -4038,12 +4038,12 @@ def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, List[str]]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, list[str]]]] = kwargs.pop("cls", None) _request = build_get_array_null_request( headers=_headers, @@ -4071,7 +4071,7 @@ def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: return deserialized # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an empty dictionary {}. :return: dict mapping str to list of str or the result of cls(response) @@ -4084,12 +4084,12 @@ def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_empty_request( headers=_headers, @@ -4117,7 +4117,7 @@ def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_item_null(self, **kwargs: Any) -> dict[str, list[str]]: """Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}. :return: dict mapping str to list of str or the result of cls(response) @@ -4130,12 +4130,12 @@ def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_null_request( headers=_headers, @@ -4163,7 +4163,7 @@ def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}. :return: dict mapping str to list of str or the result of cls(response) @@ -4176,12 +4176,12 @@ def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_item_empty_request( headers=_headers, @@ -4209,7 +4209,7 @@ def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: return deserialized # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_valid(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -4223,12 +4223,12 @@ def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_get_array_valid_request( headers=_headers, @@ -4257,7 +4257,7 @@ def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: @overload def put_array_valid( - self, array_body: Dict[str, List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -4289,7 +4289,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -4306,7 +4306,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4347,7 +4347,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries with value null. :return: dict mapping str to dict mapping str to str or the result of cls(response) @@ -4360,12 +4360,12 @@ def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_null_request( headers=_headers, @@ -4393,7 +4393,7 @@ def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {}. :return: dict mapping str to dict mapping str to str or the result of cls(response) @@ -4406,12 +4406,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_empty_request( headers=_headers, @@ -4439,7 +4439,7 @@ def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -4453,12 +4453,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_null_request( headers=_headers, @@ -4486,7 +4486,7 @@ def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -4500,12 +4500,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_item_empty_request( headers=_headers, @@ -4533,7 +4533,7 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: return deserialized # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -4548,12 +4548,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_get_dictionary_valid_request( headers=_headers, @@ -4582,7 +4582,7 @@ def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: @overload def put_dictionary_valid( - self, array_body: Dict[str, Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -4618,7 +4618,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -4636,7 +4636,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py index cf92c57b6cc..378309ea29b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/aio/operations/_duration_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import AutoRestDurationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DurationOperations: @@ -72,7 +72,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -120,7 +120,7 @@ async def put_positive_duration(self, duration_body: datetime.timedelta, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -167,7 +167,7 @@ async def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/operations/_duration_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/operations/_duration_operations.py index a43267b965e..663c8e01a72 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/operations/_duration_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyDuration/bodyduration/operations/_duration_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -128,7 +128,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -178,7 +178,7 @@ def put_positive_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -225,7 +225,7 @@ def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py index 26859db0899..7b6897b3945 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterator, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import AutoRestSwaggerBATFileServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FilesOperations: @@ -71,7 +71,7 @@ async def get_file(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -122,7 +122,7 @@ async def get_file_large(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -173,7 +173,7 @@ async def get_empty_file(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/operations/_files_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/operations/_files_operations.py index 896cb620ea2..b8ffddee4eb 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/operations/_files_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/operations/_files_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Optional, TypeVar +from typing import Any, Callable, Iterator, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -112,7 +112,7 @@ def get_file(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ def get_file_large(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -214,7 +214,7 @@ def get_empty_file(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py index e9da64cd1f1..64fb08f21a3 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, IO, List, Optional, TypeVar +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import AutoRestSwaggerBATFormDataServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FormdataOperations: @@ -77,7 +77,7 @@ async def upload_file(self, file_content: IO[bytes], file_name: str, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ async def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -182,7 +182,7 @@ async def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) -> return deserialized # type: ignore @distributed_trace_async - async def upload_files(self, file_content: List[IO[bytes]], **kwargs: Any) -> AsyncIterator[bytes]: + async def upload_files(self, file_content: list[IO[bytes]], **kwargs: Any) -> AsyncIterator[bytes]: """Upload multiple files. :param file_content: Files to upload. Required. @@ -197,7 +197,7 @@ async def upload_files(self, file_content: List[IO[bytes]], **kwargs: Any) -> As 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/models/_models_py3.py index d2aefa92006..b6050a86620 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, IO, List, Optional +from typing import Any, IO, Optional from .._utils import serialization as _serialization @@ -92,7 +92,7 @@ class Paths1P3Stk3FormdataStreamUploadfilesPostRequestbodyContentMultipartFormDa "file_content": {"key": "fileContent", "type": "[IO]"}, } - def __init__(self, *, file_content: List[IO[bytes]], **kwargs: Any) -> None: + def __init__(self, *, file_content: list[IO[bytes]], **kwargs: Any) -> None: """ :keyword file_content: Files to upload. Required. :paramtype file_content: list[IO[bytes]] diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/operations/_formdata_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/operations/_formdata_operations.py index d0d25fda583..fb5850ebff4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/operations/_formdata_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/operations/_formdata_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Iterator, List, Optional, TypeVar +from typing import Any, Callable, IO, Iterator, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -122,7 +122,7 @@ def upload_file(self, file_content: IO[bytes], file_name: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) -> Iterat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -227,7 +227,7 @@ def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) -> Iterat return deserialized # type: ignore @distributed_trace - def upload_files(self, file_content: List[IO[bytes]], **kwargs: Any) -> Iterator[bytes]: + def upload_files(self, file_content: list[IO[bytes]], **kwargs: Any) -> Iterator[bytes]: """Upload multiple files. :param file_content: Files to upload. Required. @@ -242,7 +242,7 @@ def upload_files(self, file_content: List[IO[bytes]], **kwargs: Any) -> Iterator 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/aio/operations/_formdataurlencoded_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/aio/operations/_formdataurlencoded_operations.py index 03b7ca7b031..09f6becb961 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/aio/operations/_formdataurlencoded_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/aio/operations/_formdataurlencoded_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import BodyFormsDataURLEncodedConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FormdataurlencodedOperations: @@ -92,7 +92,7 @@ async def update_pet_with_form( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -154,7 +154,7 @@ async def partial_constant_body(self, service: str, access_token: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/operations/_formdataurlencoded_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/operations/_formdataurlencoded_operations.py index e6f4e07a04f..8014b94a428 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/operations/_formdataurlencoded_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormUrlEncodedData/bodyformurlencodeddata/operations/_formdataurlencoded_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -116,7 +116,7 @@ def update_pet_with_form( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -180,7 +180,7 @@ def partial_constant_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/_int_operations_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/_int_operations_operations.py index c1ded16c779..2cef9d80fbd 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/_int_operations_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/aio/operations/_int_operations_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -44,7 +44,7 @@ from .._configuration import AutoRestIntegerTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class IntOperations: @@ -82,7 +82,7 @@ async def get_null(self, **kwargs: Any) -> Optional[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -128,7 +128,7 @@ async def get_invalid(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -174,7 +174,7 @@ async def get_overflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -220,7 +220,7 @@ async def get_underflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -266,7 +266,7 @@ async def get_overflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -312,7 +312,7 @@ async def get_underflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -360,7 +360,7 @@ async def put_max32(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -409,7 +409,7 @@ async def put_max64(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -458,7 +458,7 @@ async def put_min32(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -507,7 +507,7 @@ async def put_min64(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -554,7 +554,7 @@ async def get_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -602,7 +602,7 @@ async def put_unix_time_date(self, int_body: datetime.datetime, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -649,7 +649,7 @@ async def get_invalid_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -695,7 +695,7 @@ async def get_null_unix_time(self, **kwargs: Any) -> Optional[datetime.datetime] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/operations/_int_operations_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/operations/_int_operations_operations.py index 89b124069f7..54ba70460b0 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/operations/_int_operations_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyInteger/bodyinteger/operations/_int_operations_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -280,7 +280,7 @@ def get_null(self, **kwargs: Any) -> Optional[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -326,7 +326,7 @@ def get_invalid(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -372,7 +372,7 @@ def get_overflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -418,7 +418,7 @@ def get_underflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -464,7 +464,7 @@ def get_overflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -510,7 +510,7 @@ def get_underflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -558,7 +558,7 @@ def put_max32(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -607,7 +607,7 @@ def put_max64(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -656,7 +656,7 @@ def put_min32(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -705,7 +705,7 @@ def put_min64(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -752,7 +752,7 @@ def get_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -802,7 +802,7 @@ def put_unix_time_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -849,7 +849,7 @@ def get_invalid_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -895,7 +895,7 @@ def get_null_unix_time(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/_number_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/_number_operations.py index cda48f403fe..07603f594ba 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/_number_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/aio/operations/_number_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -54,7 +54,7 @@ from .._configuration import AutoRestNumberTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class NumberOperations: # pylint: disable=too-many-public-methods @@ -90,7 +90,7 @@ async def get_null(self, **kwargs: Any) -> Optional[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -136,7 +136,7 @@ async def get_invalid_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -182,7 +182,7 @@ async def get_invalid_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -228,7 +228,7 @@ async def get_invalid_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ async def put_big_float(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -323,7 +323,7 @@ async def get_big_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -371,7 +371,7 @@ async def put_big_double(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -418,7 +418,7 @@ async def get_big_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -464,7 +464,7 @@ async def put_big_double_positive_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -512,7 +512,7 @@ async def get_big_double_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -558,7 +558,7 @@ async def put_big_double_negative_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -606,7 +606,7 @@ async def get_big_double_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -654,7 +654,7 @@ async def put_big_decimal(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -701,7 +701,7 @@ async def get_big_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -747,7 +747,7 @@ async def put_big_decimal_positive_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -795,7 +795,7 @@ async def get_big_decimal_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -841,7 +841,7 @@ async def put_big_decimal_negative_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -889,7 +889,7 @@ async def get_big_decimal_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -937,7 +937,7 @@ async def put_small_float(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -984,7 +984,7 @@ async def get_small_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1032,7 +1032,7 @@ async def put_small_double(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1079,7 +1079,7 @@ async def get_small_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1127,7 +1127,7 @@ async def put_small_decimal(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1174,7 +1174,7 @@ async def get_small_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/operations/_number_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/operations/_number_operations.py index dc7f9bf0efd..8aa0464225e 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/operations/_number_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyNumber/bodynumber/operations/_number_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -437,7 +437,7 @@ def get_null(self, **kwargs: Any) -> Optional[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -483,7 +483,7 @@ def get_invalid_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -529,7 +529,7 @@ def get_invalid_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -575,7 +575,7 @@ def get_invalid_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -625,7 +625,7 @@ def put_big_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -672,7 +672,7 @@ def get_big_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -722,7 +722,7 @@ def put_big_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -769,7 +769,7 @@ def get_big_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -815,7 +815,7 @@ def put_big_double_positive_decimal(self, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -863,7 +863,7 @@ def get_big_double_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -909,7 +909,7 @@ def put_big_double_negative_decimal(self, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -957,7 +957,7 @@ def get_big_double_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1007,7 +1007,7 @@ def put_big_decimal( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1054,7 +1054,7 @@ def get_big_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1100,7 +1100,7 @@ def put_big_decimal_positive_decimal(self, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1148,7 +1148,7 @@ def get_big_decimal_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1194,7 +1194,7 @@ def put_big_decimal_negative_decimal(self, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1242,7 +1242,7 @@ def get_big_decimal_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1292,7 +1292,7 @@ def put_small_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1339,7 +1339,7 @@ def get_small_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1389,7 +1389,7 @@ def put_small_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1436,7 +1436,7 @@ def get_small_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1486,7 +1486,7 @@ def put_small_decimal( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1533,7 +1533,7 @@ def get_small_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py index 1239ca14213..ece7735d2cd 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_enum_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AutoRestSwaggerBATServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class EnumOperations: @@ -71,7 +71,7 @@ async def get_not_expandable(self, **kwargs: Any) -> Union[str, _models.Colors]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -120,7 +120,7 @@ async def put_not_expandable(self, string_body: Union[str, _models.Colors], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -167,7 +167,7 @@ async def get_referenced(self, **kwargs: Any) -> Union[str, _models.Colors]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -216,7 +216,7 @@ async def put_referenced(self, enum_string_body: Union[str, _models.Colors], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -263,7 +263,7 @@ async def get_referenced_constant(self, **kwargs: Any) -> _models.RefColorConsta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -311,7 +311,7 @@ async def put_referenced_constant(self, field1: Optional[str] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_string_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_string_operations.py index fda82b9cb5d..e6fa06816de 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_string_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/aio/operations/_string_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -42,7 +42,7 @@ from .._configuration import AutoRestSwaggerBATServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class StringOperations: @@ -78,7 +78,7 @@ async def get_null(self, **kwargs: Any) -> Optional[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ async def put_null(self, string_body: Optional[str] = None, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -176,7 +176,7 @@ async def get_empty(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -222,7 +222,7 @@ async def put_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -270,7 +270,7 @@ async def get_mbcs(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -316,7 +316,7 @@ async def put_mbcs(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -371,7 +371,7 @@ async def get_whitespace(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -419,7 +419,7 @@ async def put_whitespace(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -469,7 +469,7 @@ async def get_not_provided(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -515,7 +515,7 @@ async def get_base64_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -561,7 +561,7 @@ async def get_base64_url_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -609,7 +609,7 @@ async def put_base64_url_encoded(self, string_body: bytes, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -656,7 +656,7 @@ async def get_null_base64_url_encoded(self, **kwargs: Any) -> Optional[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py index 01d394b62af..c2357757467 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_enum_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -159,7 +159,7 @@ def get_not_expandable(self, **kwargs: Any) -> Union[str, _models.Colors]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -210,7 +210,7 @@ def put_not_expandable( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -257,7 +257,7 @@ def get_referenced(self, **kwargs: Any) -> Union[str, _models.Colors]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -308,7 +308,7 @@ def put_referenced( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -355,7 +355,7 @@ def get_referenced_constant(self, **kwargs: Any) -> _models.RefColorConstant: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -405,7 +405,7 @@ def put_referenced_constant( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_string_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_string_operations.py index ed17c1bb883..ceb8a3448c0 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_string_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyString/bodystring/operations/_string_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -273,7 +273,7 @@ def get_null(self, **kwargs: Any) -> Optional[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -323,7 +323,7 @@ def put_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -373,7 +373,7 @@ def get_empty(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -419,7 +419,7 @@ def put_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -467,7 +467,7 @@ def get_mbcs(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -513,7 +513,7 @@ def put_mbcs(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -568,7 +568,7 @@ def get_whitespace(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -616,7 +616,7 @@ def put_whitespace(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -666,7 +666,7 @@ def get_not_provided(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -712,7 +712,7 @@ def get_base64_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -758,7 +758,7 @@ def get_base64_url_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -808,7 +808,7 @@ def put_base64_url_encoded( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -855,7 +855,7 @@ def get_null_base64_url_encoded(self, **kwargs: Any) -> Optional[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/_time_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/_time_operations.py index a2e5c616052..cbcf01dcbe4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/_time_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/aio/operations/_time_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import AutoRestTimeTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class TimeOperations: @@ -65,7 +65,7 @@ async def get(self, **kwargs: Any) -> datetime.time: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -113,7 +113,7 @@ async def put(self, time_body: datetime.time, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/operations/_time_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/operations/_time_operations.py index 1d39e4ae733..005962cee72 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/operations/_time_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyTime/bodytime/operations/_time_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -98,7 +98,7 @@ def get(self, **kwargs: Any) -> datetime.time: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -146,7 +146,7 @@ def put(self, time_body: datetime.time, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/aio/operations/_client_with_enum_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/aio/operations/_client_with_enum_operations.py index 6cd69ae75bf..f04346887be 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/aio/operations/_client_with_enum_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/aio/operations/_client_with_enum_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import ClientWithEnumConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ClientWithEnumOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/operations/_client_with_enum_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/operations/_client_with_enum_operations.py index c93aeeae9a3..974b12c5c1a 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/operations/_client_with_enum_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ClientEnum/clientenum/operations/_client_with_enum_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -64,7 +64,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/aio/operations/_contants_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/aio/operations/_contants_operations.py index e7457973fd0..01889292215 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/aio/operations/_contants_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/aio/operations/_contants_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -46,7 +46,7 @@ from .._configuration import AutoRestSwaggerConstantServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ContantsOperations: @@ -92,7 +92,7 @@ async def put_no_model_as_string_no_required_two_value_no_default( # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -140,7 +140,7 @@ async def put_no_model_as_string_no_required_two_value_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -188,7 +188,7 @@ async def put_no_model_as_string_no_required_one_value_no_default( # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -236,7 +236,7 @@ async def put_no_model_as_string_no_required_one_value_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -284,7 +284,7 @@ async def put_no_model_as_string_required_two_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -332,7 +332,7 @@ async def put_no_model_as_string_required_two_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -378,7 +378,7 @@ async def put_no_model_as_string_required_one_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -425,7 +425,7 @@ async def put_no_model_as_string_required_one_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -474,7 +474,7 @@ async def put_model_as_string_no_required_two_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -522,7 +522,7 @@ async def put_model_as_string_no_required_two_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -570,7 +570,7 @@ async def put_model_as_string_no_required_one_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -618,7 +618,7 @@ async def put_model_as_string_no_required_one_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -666,7 +666,7 @@ async def put_model_as_string_required_two_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -714,7 +714,7 @@ async def put_model_as_string_required_two_value_default( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -762,7 +762,7 @@ async def put_model_as_string_required_one_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -810,7 +810,7 @@ async def put_model_as_string_required_one_value_default( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -853,7 +853,7 @@ async def put_client_constants(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/operations/_contants_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/operations/_contants_operations.py index 66d60f93dea..9dbc4498769 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/operations/_contants_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Constants/constants/operations/_contants_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -335,7 +335,7 @@ def put_no_model_as_string_no_required_two_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -383,7 +383,7 @@ def put_no_model_as_string_no_required_two_value_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -431,7 +431,7 @@ def put_no_model_as_string_no_required_one_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -479,7 +479,7 @@ def put_no_model_as_string_no_required_one_value_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -527,7 +527,7 @@ def put_no_model_as_string_required_two_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -575,7 +575,7 @@ def put_no_model_as_string_required_two_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -621,7 +621,7 @@ def put_no_model_as_string_required_one_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -668,7 +668,7 @@ def put_no_model_as_string_required_one_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -717,7 +717,7 @@ def put_model_as_string_no_required_two_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -765,7 +765,7 @@ def put_model_as_string_no_required_two_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -813,7 +813,7 @@ def put_model_as_string_no_required_one_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -861,7 +861,7 @@ def put_model_as_string_no_required_one_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -909,7 +909,7 @@ def put_model_as_string_required_two_value_no_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -957,7 +957,7 @@ def put_model_as_string_required_two_value_default( # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1005,7 +1005,7 @@ def put_model_as_string_required_one_value_no_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1053,7 +1053,7 @@ def put_model_as_string_required_one_value_default( # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1096,7 +1096,7 @@ def put_client_constants(self, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py index a1963f30616..e86299c7028 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/aio/operations/_paths_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestParameterizedHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: @@ -68,7 +68,7 @@ async def get_empty(self, account_name: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py index 37bd3dc2b0d..f9884726fb2 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUri/custombaseurl/operations/_paths_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestParameterizedHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -84,7 +84,7 @@ def get_empty(self, account_name: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/_paths_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/_paths_operations.py index 8ad8f5a6a1d..be92f7ad04c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/_paths_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/aio/operations/_paths_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutoRestParameterizedCustomHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: @@ -73,7 +73,7 @@ async def get_empty(self, vault: str, secret: str, key_name: str, key_version: s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/operations/_paths_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/operations/_paths_operations.py index c3e24dc282d..313cc46ee74 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/operations/_paths_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/CustomBaseUriMoreOptions/custombaseurlmoreoptions/operations/_paths_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -105,7 +105,7 @@ def get_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_error_with_secrets_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_error_with_secrets_operations.py index 88524c76a41..a79260fd707 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_error_with_secrets_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/aio/operations/_error_with_secrets_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import ErrorWithSecretsConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ErrorWithSecretsOperationsMixin( @@ -52,7 +52,7 @@ async def create_secret(self, **kwargs: Any) -> _models.SecretResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def get_error_with_secrets(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py index 5331dd82e22..ab6953a0e01 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -55,9 +55,9 @@ def __init__( *, code: Union[str, "_models.ErrorCode"], message: str, - additional_properties: Optional[Dict[str, Any]] = None, + additional_properties: Optional[dict[str, Any]] = None, target: Optional[str] = None, - details: Optional[List["_models.Error"]] = None, + details: Optional[list["_models.Error"]] = None, innererror: Optional["_models.InnerError"] = None, **kwargs: Any ) -> None: @@ -109,7 +109,7 @@ class ErrorResponse(_serialization.Model): } def __init__( - self, *, error: "_models.Error", additional_properties: Optional[Dict[str, Any]] = None, **kwargs: Any + self, *, error: "_models.Error", additional_properties: Optional[dict[str, Any]] = None, **kwargs: Any ) -> None: """ :keyword additional_properties: Unmatched properties from the message are deserialized to this @@ -160,7 +160,7 @@ def __init__( *, code: Union[str, "_models.InnerErrorCode"], message: str, - additional_properties: Optional[Dict[str, Any]] = None, + additional_properties: Optional[dict[str, Any]] = None, innererror: Optional["_models.InnerError"] = None, **kwargs: Any ) -> None: diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_error_with_secrets_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_error_with_secrets_operations.py index 552ab2bee18..20174b86577 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_error_with_secrets_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ErrorWithSecrets/errorwithsecrets/operations/_error_with_secrets_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -80,7 +80,7 @@ def create_secret(self, **kwargs: Any) -> _models.SecretResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def get_error_with_secrets(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py index abeaf371ed3..83c1b0777d4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/aio/operations/_pet_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import PetStoreIncConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PetOperations: @@ -67,7 +67,7 @@ async def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> _models.Pet: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -147,7 +147,7 @@ async def add_pet(self, pet_param: Optional[Union[_models.Pet, IO[bytes]]] = Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py index ea1b69af117..2f9e47b0b8e 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ExtensibleEnums/extensibleenumsswagger/operations/_pet_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -105,7 +105,7 @@ def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> _models.Pet: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def add_pet(self, pet_param: Optional[Union[_models.Pet, IO[bytes]]] = None, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/aio/operations/_header_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/aio/operations/_header_operations.py index 15408472301..1fd1686afcc 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/aio/operations/_header_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/aio/operations/_header_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -59,7 +59,7 @@ from .._configuration import AutoRestSwaggerBATHeaderServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: # pylint: disable=too-many-public-methods @@ -100,7 +100,7 @@ async def param_existing_key(self, user_agent_parameter: str, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -143,7 +143,7 @@ async def response_existing_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -188,7 +188,7 @@ async def param_protected_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -232,7 +232,7 @@ async def response_protected_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -283,7 +283,7 @@ async def param_integer(self, scenario: str, value: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ async def response_integer(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -382,7 +382,7 @@ async def param_long(self, scenario: str, value: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -429,7 +429,7 @@ async def response_long(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -481,7 +481,7 @@ async def param_float(self, scenario: str, value: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -528,7 +528,7 @@ async def response_float(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -580,7 +580,7 @@ async def param_double(self, scenario: str, value: float, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -627,7 +627,7 @@ async def response_double(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -679,7 +679,7 @@ async def param_bool(self, scenario: str, value: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -726,7 +726,7 @@ async def response_bool(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -779,7 +779,7 @@ async def param_string(self, scenario: str, value: Optional[str] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -826,7 +826,7 @@ async def response_string(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -877,7 +877,7 @@ async def param_date(self, scenario: str, value: datetime.date, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -923,7 +923,7 @@ async def response_date(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -975,7 +975,7 @@ async def param_datetime(self, scenario: str, value: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1021,7 +1021,7 @@ async def response_datetime(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1075,7 +1075,7 @@ async def param_datetime_rfc1123( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1122,7 +1122,7 @@ async def response_datetime_rfc1123(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1172,7 +1172,7 @@ async def param_duration(self, scenario: str, value: datetime.timedelta, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1218,7 +1218,7 @@ async def response_duration(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1268,7 +1268,7 @@ async def param_byte(self, scenario: str, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1314,7 +1314,7 @@ async def response_byte(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1369,7 +1369,7 @@ async def param_enum( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1416,7 +1416,7 @@ async def response_enum(self, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1463,7 +1463,7 @@ async def custom_request_id(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/operations/_header_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/operations/_header_operations.py index 01f30118364..3ac73104dcd 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/operations/_header_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Header/header/operations/_header_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -527,7 +527,7 @@ def param_existing_key( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -570,7 +570,7 @@ def response_existing_key(self, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -615,7 +615,7 @@ def param_protected_key(self, **kwargs: Any) -> None: # pylint: disable=inconsi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -659,7 +659,7 @@ def response_protected_key(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -712,7 +712,7 @@ def param_integer( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -759,7 +759,7 @@ def response_integer(self, scenario: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -813,7 +813,7 @@ def param_long( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -860,7 +860,7 @@ def response_long(self, scenario: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -914,7 +914,7 @@ def param_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -961,7 +961,7 @@ def response_float(self, scenario: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1015,7 +1015,7 @@ def param_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1062,7 +1062,7 @@ def response_double(self, scenario: str, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1116,7 +1116,7 @@ def param_bool( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1163,7 +1163,7 @@ def response_bool(self, scenario: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1218,7 +1218,7 @@ def param_string( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1265,7 +1265,7 @@ def response_string(self, scenario: str, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1318,7 +1318,7 @@ def param_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1364,7 +1364,7 @@ def response_date(self, scenario: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1418,7 +1418,7 @@ def param_datetime( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1464,7 +1464,7 @@ def response_datetime(self, scenario: str, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1518,7 +1518,7 @@ def param_datetime_rfc1123( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1567,7 +1567,7 @@ def response_datetime_rfc1123( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1619,7 +1619,7 @@ def param_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1665,7 +1665,7 @@ def response_duration(self, scenario: str, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1717,7 +1717,7 @@ def param_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1763,7 +1763,7 @@ def response_byte(self, scenario: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1818,7 +1818,7 @@ def param_enum( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1865,7 +1865,7 @@ def response_enum(self, scenario: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1912,7 +1912,7 @@ def custom_request_id(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_client_failure_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_client_failure_operations.py index dc40330b4a7..98278fd6ad6 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_client_failure_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_client_failure_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -56,7 +56,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpClientFailureOperations: # pylint: disable=too-many-public-methods @@ -94,7 +94,7 @@ async def head400(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -136,7 +136,7 @@ async def get400(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -178,7 +178,7 @@ async def options400(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -223,7 +223,7 @@ async def put400(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ async def patch400(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -329,7 +329,7 @@ async def post400(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -382,7 +382,7 @@ async def delete400(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -432,7 +432,7 @@ async def head401(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -474,7 +474,7 @@ async def get402(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -516,7 +516,7 @@ async def options403(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -558,7 +558,7 @@ async def get403(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -603,7 +603,7 @@ async def put404(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -656,7 +656,7 @@ async def patch405(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -709,7 +709,7 @@ async def post406(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -762,7 +762,7 @@ async def delete407(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -815,7 +815,7 @@ async def put409(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -865,7 +865,7 @@ async def head410(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -907,7 +907,7 @@ async def get411(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -949,7 +949,7 @@ async def options412(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -991,7 +991,7 @@ async def get412(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1036,7 +1036,7 @@ async def put413(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1089,7 +1089,7 @@ async def patch414(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1142,7 +1142,7 @@ async def post415(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1192,7 +1192,7 @@ async def get416(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1237,7 +1237,7 @@ async def delete417(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1287,7 +1287,7 @@ async def head429(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_failure_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_failure_operations.py index 13978972119..cf3666f7daa 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_failure_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_failure_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpFailureOperations: @@ -69,7 +69,7 @@ async def get_empty_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -115,7 +115,7 @@ async def get_no_model_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -160,7 +160,7 @@ async def get_no_model_empty(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_redirects_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_redirects_operations.py index c63118efbee..ca394566ec8 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_redirects_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_redirects_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -45,7 +45,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpRedirectsOperations: @@ -83,7 +83,7 @@ async def head300(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -116,7 +116,7 @@ async def head300(self, **kwargs: Any) -> None: return cls(pipeline_response, None, response_headers) # type: ignore @distributed_trace_async - async def get300(self, **kwargs: Any) -> Optional[List[str]]: + async def get300(self, **kwargs: Any) -> Optional[list[str]]: """Return 300 status code and redirect to /http/success/200. :return: list of str or None or the result of cls(response) @@ -129,12 +129,12 @@ async def get300(self, **kwargs: Any) -> Optional[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[list[str]]] = kwargs.pop("cls", None) _request = build_get300_request( headers=_headers, @@ -180,7 +180,7 @@ async def head301(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -226,7 +226,7 @@ async def get301(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ async def put301(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -329,7 +329,7 @@ async def head302(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -375,7 +375,7 @@ async def get302(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -425,7 +425,7 @@ async def patch302(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -482,7 +482,7 @@ async def post303(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -536,7 +536,7 @@ async def head307(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -582,7 +582,7 @@ async def get307(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -628,7 +628,7 @@ async def options307(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -677,7 +677,7 @@ async def put307(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -734,7 +734,7 @@ async def patch307(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -791,7 +791,7 @@ async def post307(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -848,7 +848,7 @@ async def delete307(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_retry_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_retry_operations.py index ed768fe5cf0..59f3c1bf77d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_retry_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_retry_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -38,7 +38,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpRetryOperations: @@ -76,7 +76,7 @@ async def head408(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -121,7 +121,7 @@ async def put500(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -174,7 +174,7 @@ async def patch500(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -224,7 +224,7 @@ async def get502(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -266,7 +266,7 @@ async def options502(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -315,7 +315,7 @@ async def post503(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -368,7 +368,7 @@ async def delete503(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -421,7 +421,7 @@ async def put504(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -474,7 +474,7 @@ async def patch504(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_server_failure_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_server_failure_operations.py index 85df71ca4b6..f769a51d57d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_server_failure_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_server_failure_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpServerFailureOperations: @@ -71,7 +71,7 @@ async def head501(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -113,7 +113,7 @@ async def get501(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -158,7 +158,7 @@ async def post505(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -211,7 +211,7 @@ async def delete505(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_success_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_success_operations.py index f4e307f9093..f4877cde2c5 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_success_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_http_success_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -49,7 +49,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HttpSuccessOperations: @@ -87,7 +87,7 @@ async def head200(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -129,7 +129,7 @@ async def get200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -175,7 +175,7 @@ async def options200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -224,7 +224,7 @@ async def put200(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -277,7 +277,7 @@ async def patch200(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ async def post200(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -383,7 +383,7 @@ async def delete200(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -436,7 +436,7 @@ async def put201(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -489,7 +489,7 @@ async def post201(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -542,7 +542,7 @@ async def put202(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -595,7 +595,7 @@ async def patch202(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -648,7 +648,7 @@ async def post202(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -701,7 +701,7 @@ async def delete202(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -751,7 +751,7 @@ async def head204(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -796,7 +796,7 @@ async def put204(self, boolean_value: Literal[True] = True, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -849,7 +849,7 @@ async def patch204(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -902,7 +902,7 @@ async def post204(self, boolean_value: Literal[True] = True, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -955,7 +955,7 @@ async def delete204(self, boolean_value: Literal[True] = True, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1005,7 +1005,7 @@ async def head404(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py index 009f1e30a04..1c78f4e6853 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/aio/operations/_multiple_responses_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -63,7 +63,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class MultipleResponsesOperations: # pylint: disable=too-many-public-methods @@ -103,7 +103,7 @@ async def get200_model204_no_model_default_error200_valid( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -153,7 +153,7 @@ async def get200_model204_no_model_default_error204_valid( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -203,7 +203,7 @@ async def get200_model204_no_model_default_error201_invalid( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -253,7 +253,7 @@ async def get200_model204_no_model_default_error202_none( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -303,7 +303,7 @@ async def get200_model204_no_model_default_error400_valid( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -353,7 +353,7 @@ async def get200_model201_model_default_error200_valid( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -405,7 +405,7 @@ async def get200_model201_model_default_error201_valid( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -457,7 +457,7 @@ async def get200_model201_model_default_error400_valid( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -510,7 +510,7 @@ async def get200_model_a201_model_c404_model_d_default_error200_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -566,7 +566,7 @@ async def get200_model_a201_model_c404_model_d_default_error201_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -622,7 +622,7 @@ async def get200_model_a201_model_c404_model_d_default_error404_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -678,7 +678,7 @@ async def get200_model_a201_model_c404_model_d_default_error400_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -731,7 +731,7 @@ async def get202_none204_none_default_error202_none(self, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -773,7 +773,7 @@ async def get202_none204_none_default_error204_none(self, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -815,7 +815,7 @@ async def get202_none204_none_default_error400_valid(self, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -857,7 +857,7 @@ async def get202_none204_none_default_none202_invalid(self, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -898,7 +898,7 @@ async def get202_none204_none_default_none204_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -939,7 +939,7 @@ async def get202_none204_none_default_none400_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -980,7 +980,7 @@ async def get202_none204_none_default_none400_invalid(self, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1021,7 +1021,7 @@ async def get_default_model_a200_valid(self, **kwargs: Any) -> _models.MyExcepti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1066,7 +1066,7 @@ async def get_default_model_a200_none(self, **kwargs: Any) -> _models.MyExceptio 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1111,7 +1111,7 @@ async def get_default_model_a400_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1153,7 +1153,7 @@ async def get_default_model_a400_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1195,7 +1195,7 @@ async def get_default_none200_invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1236,7 +1236,7 @@ async def get_default_none200_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1277,7 +1277,7 @@ async def get_default_none400_invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1318,7 +1318,7 @@ async def get_default_none400_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1360,7 +1360,7 @@ async def get200_model_a200_none(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1405,7 +1405,7 @@ async def get200_model_a200_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1450,7 +1450,7 @@ async def get200_model_a200_invalid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1495,7 +1495,7 @@ async def get200_model_a400_none(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1540,7 +1540,7 @@ async def get200_model_a400_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1585,7 +1585,7 @@ async def get200_model_a400_invalid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1630,7 +1630,7 @@ async def get200_model_a202_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_client_failure_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_client_failure_operations.py index a22b6ff0f52..ccdf21be232 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_client_failure_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_client_failure_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -472,7 +472,7 @@ def head400(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -514,7 +514,7 @@ def get400(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -556,7 +556,7 @@ def options400(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -603,7 +603,7 @@ def put400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -658,7 +658,7 @@ def patch400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -713,7 +713,7 @@ def post400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -768,7 +768,7 @@ def delete400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -818,7 +818,7 @@ def head401(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -860,7 +860,7 @@ def get402(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -902,7 +902,7 @@ def options403(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -944,7 +944,7 @@ def get403(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -991,7 +991,7 @@ def put404( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1046,7 +1046,7 @@ def patch405( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1101,7 +1101,7 @@ def post406( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1156,7 +1156,7 @@ def delete407( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1211,7 +1211,7 @@ def put409( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1261,7 +1261,7 @@ def head410(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1303,7 +1303,7 @@ def get411(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1345,7 +1345,7 @@ def options412(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1387,7 +1387,7 @@ def get412(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1434,7 +1434,7 @@ def put413( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1489,7 +1489,7 @@ def patch414( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1544,7 +1544,7 @@ def post415( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1594,7 +1594,7 @@ def get416(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1641,7 +1641,7 @@ def delete417( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1691,7 +1691,7 @@ def head429(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_failure_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_failure_operations.py index d80f8602c9d..e4553cfeca3 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_failure_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_failure_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -110,7 +110,7 @@ def get_empty_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -156,7 +156,7 @@ def get_no_model_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -201,7 +201,7 @@ def get_no_model_empty(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_redirects_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_redirects_operations.py index 428a81ba271..e6821f3b90c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_redirects_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_redirects_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -314,7 +314,7 @@ def head300(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def head300(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return return cls(pipeline_response, None, response_headers) # type: ignore @distributed_trace - def get300(self, **kwargs: Any) -> Optional[List[str]]: + def get300(self, **kwargs: Any) -> Optional[list[str]]: """Return 300 status code and redirect to /http/success/200. :return: list of str or None or the result of cls(response) @@ -360,12 +360,12 @@ def get300(self, **kwargs: Any) -> Optional[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[list[str]]] = kwargs.pop("cls", None) _request = build_get300_request( headers=_headers, @@ -411,7 +411,7 @@ def head301(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -457,7 +457,7 @@ def get301(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -509,7 +509,7 @@ def put301( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -562,7 +562,7 @@ def head302(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -608,7 +608,7 @@ def get302(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -660,7 +660,7 @@ def patch302( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -719,7 +719,7 @@ def post303( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -773,7 +773,7 @@ def head307(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -819,7 +819,7 @@ def get307(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -865,7 +865,7 @@ def options307(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -916,7 +916,7 @@ def put307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -975,7 +975,7 @@ def patch307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1034,7 +1034,7 @@ def post307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1093,7 +1093,7 @@ def delete307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_retry_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_retry_operations.py index 1a9f39fccd5..bbba2e95304 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_retry_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_retry_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -212,7 +212,7 @@ def head408(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -259,7 +259,7 @@ def put500( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -314,7 +314,7 @@ def patch500( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -364,7 +364,7 @@ def get502(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -406,7 +406,7 @@ def options502(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -457,7 +457,7 @@ def post503( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -512,7 +512,7 @@ def delete503( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -567,7 +567,7 @@ def put504( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -622,7 +622,7 @@ def patch504( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_server_failure_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_server_failure_operations.py index 3981ccd3bd5..1c6ccd2901b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_server_failure_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_server_failure_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -130,7 +130,7 @@ def head501(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -172,7 +172,7 @@ def get501(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -219,7 +219,7 @@ def post505( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -274,7 +274,7 @@ def delete505( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_success_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_success_operations.py index cc83255487f..a1a52bfff69 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_success_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_http_success_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -377,7 +377,7 @@ def head200(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -419,7 +419,7 @@ def get200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -465,7 +465,7 @@ def options200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -516,7 +516,7 @@ def put200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -571,7 +571,7 @@ def patch200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -626,7 +626,7 @@ def post200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -681,7 +681,7 @@ def delete200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -736,7 +736,7 @@ def put201( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -791,7 +791,7 @@ def post201( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -846,7 +846,7 @@ def put202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -901,7 +901,7 @@ def patch202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -956,7 +956,7 @@ def post202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1011,7 +1011,7 @@ def delete202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1061,7 +1061,7 @@ def head204(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1108,7 +1108,7 @@ def put204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1163,7 +1163,7 @@ def patch204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1218,7 +1218,7 @@ def post204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1273,7 +1273,7 @@ def delete204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1323,7 +1323,7 @@ def head404(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py index dc8d620e0a3..4a6961d7fa6 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Http/httpinfrastructure/operations/_multiple_responses_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -529,7 +529,7 @@ def get200_model204_no_model_default_error200_valid( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -579,7 +579,7 @@ def get200_model204_no_model_default_error204_valid( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -629,7 +629,7 @@ def get200_model204_no_model_default_error201_invalid( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -679,7 +679,7 @@ def get200_model204_no_model_default_error202_none( # pylint: disable=name-too- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -729,7 +729,7 @@ def get200_model204_no_model_default_error400_valid( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -779,7 +779,7 @@ def get200_model201_model_default_error200_valid( # pylint: disable=name-too-lo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -831,7 +831,7 @@ def get200_model201_model_default_error201_valid( # pylint: disable=name-too-lo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -883,7 +883,7 @@ def get200_model201_model_default_error400_valid( # pylint: disable=name-too-lo 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -936,7 +936,7 @@ def get200_model_a201_model_c404_model_d_default_error200_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -992,7 +992,7 @@ def get200_model_a201_model_c404_model_d_default_error201_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1048,7 +1048,7 @@ def get200_model_a201_model_c404_model_d_default_error404_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1104,7 +1104,7 @@ def get200_model_a201_model_c404_model_d_default_error400_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1159,7 +1159,7 @@ def get202_none204_none_default_error202_none( # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1203,7 +1203,7 @@ def get202_none204_none_default_error204_none( # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1247,7 +1247,7 @@ def get202_none204_none_default_error400_valid( # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1291,7 +1291,7 @@ def get202_none204_none_default_none202_invalid( # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1334,7 +1334,7 @@ def get202_none204_none_default_none204_none( # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1377,7 +1377,7 @@ def get202_none204_none_default_none400_none( # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1420,7 +1420,7 @@ def get202_none204_none_default_none400_invalid( # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1461,7 +1461,7 @@ def get_default_model_a200_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1506,7 +1506,7 @@ def get_default_model_a200_none(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1551,7 +1551,7 @@ def get_default_model_a400_valid(self, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1593,7 +1593,7 @@ def get_default_model_a400_none(self, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1635,7 +1635,7 @@ def get_default_none200_invalid(self, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1676,7 +1676,7 @@ def get_default_none200_none(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1717,7 +1717,7 @@ def get_default_none400_invalid(self, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1758,7 +1758,7 @@ def get_default_none400_none(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1800,7 +1800,7 @@ def get200_model_a200_none(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1845,7 +1845,7 @@ def get200_model_a200_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1890,7 +1890,7 @@ def get200_model_a200_invalid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1935,7 +1935,7 @@ def get200_model_a400_none(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1980,7 +1980,7 @@ def get200_model_a400_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2025,7 +2025,7 @@ def get200_model_a400_invalid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2070,7 +2070,7 @@ def get200_model_a202_valid(self, **kwargs: Any) -> _models.MyException: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/aio/operations/_incorrect_returned_error_model_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/aio/operations/_incorrect_returned_error_model_operations.py index b1b4b892ee2..5972883c370 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/aio/operations/_incorrect_returned_error_model_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/aio/operations/_incorrect_returned_error_model_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import IncorrectReturnedErrorModelConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _IncorrectReturnedErrorModelOperationsMixin( @@ -49,7 +49,7 @@ async def get_incorrect_error_from_server(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/operations/_incorrect_returned_error_model_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/operations/_incorrect_returned_error_model_operations.py index 38efe13bcb3..985112ea28a 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/operations/_incorrect_returned_error_model_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/IncorrectErrorResponse/incorrecterrorresponse/operations/_incorrect_returned_error_model_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -58,7 +58,7 @@ def get_incorrect_error_from_server(self, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/aio/operations/_media_types_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/aio/operations/_media_types_client_operations.py index 49ba3228c04..af8743d1f74 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/aio/operations/_media_types_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/aio/operations/_media_types_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -38,7 +38,7 @@ from .._configuration import MediaTypesClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MediaTypesClientOperationsMixin( @@ -95,7 +95,7 @@ async def analyze_body(self, input: Optional[Union[_models.SourcePath, IO[bytes] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -196,7 +196,7 @@ async def analyze_body_no_accept_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -254,7 +254,7 @@ async def content_type_with_encoding(self, input: Optional[str] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ async def binary_body_with_two_content_types(self, message: IO[bytes], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -364,7 +364,7 @@ async def binary_body_with_three_content_types(self, message: IO[bytes], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -429,7 +429,7 @@ async def _body_three_types(self, message: Union[Any, IO[bytes], str], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -489,7 +489,7 @@ async def put_text_and_json_body(self, message: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/operations/_media_types_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/operations/_media_types_client_operations.py index ed5ec5f5268..d227fa71481 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/operations/_media_types_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/InternalOperation/internaloperation/operations/_media_types_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -209,7 +209,7 @@ def analyze_body(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ def analyze_body_no_accept_header( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -368,7 +368,7 @@ def content_type_with_encoding(self, input: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def binary_body_with_two_content_types(self, message: IO[bytes], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -478,7 +478,7 @@ def binary_body_with_three_content_types(self, message: IO[bytes], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -541,7 +541,7 @@ def _body_three_types(self, message: Union[Any, IO[bytes], str], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -601,7 +601,7 @@ def put_text_and_json_body(self, message: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py index bf346c2f8a6..9d97bdecfd4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/aio/operations/_media_types_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -38,7 +38,7 @@ from .._configuration import MediaTypesClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MediaTypesClientOperationsMixin( @@ -95,7 +95,7 @@ async def analyze_body(self, input: Optional[Union[_models.SourcePath, IO[bytes] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -196,7 +196,7 @@ async def analyze_body_no_accept_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -254,7 +254,7 @@ async def content_type_with_encoding(self, input: Optional[str] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ async def binary_body_with_two_content_types(self, message: IO[bytes], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -364,7 +364,7 @@ async def binary_body_with_three_content_types(self, message: IO[bytes], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -469,7 +469,7 @@ async def body_three_types(self, message: Union[Any, IO[bytes], str], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -529,7 +529,7 @@ async def put_text_and_json_body(self, message: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py index b7c3fb09922..837cbbd147e 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MediaTypes/mediatypes/operations/_media_types_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -209,7 +209,7 @@ def analyze_body(self, input: Optional[Union[_models.SourcePath, IO[bytes]]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ def analyze_body_no_accept_header( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -368,7 +368,7 @@ def content_type_with_encoding(self, input: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def binary_body_with_two_content_types(self, message: IO[bytes], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -478,7 +478,7 @@ def binary_body_with_three_content_types(self, message: IO[bytes], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -583,7 +583,7 @@ def body_three_types(self, message: Union[Any, IO[bytes], str], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -643,7 +643,7 @@ def put_text_and_json_body(self, message: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_merge_patch_json_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_merge_patch_json_client.py index 253de12bf43..fceb0b9d5eb 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_merge_patch_json_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_merge_patch_json_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -50,7 +50,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/_merge_patch_json_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/_merge_patch_json_client.py index fd11c5d9fa0..21d5acd7811 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/_merge_patch_json_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/_merge_patch_json_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -50,7 +50,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/operations/_merge_patch_json_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/operations/_merge_patch_json_client_operations.py index 626d9dcabb9..2d23418e1a3 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/operations/_merge_patch_json_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/aio/operations/_merge_patch_json_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MergePatchJsonClientOperationsMixin( @@ -52,7 +52,7 @@ async def patch_single(self, body: JSON, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/operations/_merge_patch_json_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/operations/_merge_patch_json_client_operations.py index def638be04e..53a1bb7e6db 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/operations/_merge_patch_json_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MergePatchJson/mergepatchjson/operations/_merge_patch_json_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -71,7 +71,7 @@ def patch_single(self, body: JSON, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py index 49192e3f52d..b6e5b6eac8e 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/aio/operations/_auto_rest_resource_flattening_test_service_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Literal, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -42,7 +42,7 @@ from .._configuration import AutoRestResourceFlatteningTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestResourceFlatteningTestServiceOperationsMixin( @@ -54,7 +54,7 @@ class _AutoRestResourceFlatteningTestServiceOperationsMixin( @overload async def put_array( self, - resource_array: Optional[List[_models.Resource]] = None, + resource_array: Optional[list[_models.Resource]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -95,7 +95,7 @@ async def put_array( @distributed_trace_async async def put_array( - self, resource_array: Optional[Union[List[_models.Resource], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[_models.Resource], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as an Array. @@ -115,7 +115,7 @@ async def put_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -159,7 +159,7 @@ async def put_array( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array(self, **kwargs: Any) -> List[_models.FlattenedProduct]: + async def get_array(self, **kwargs: Any) -> list[_models.FlattenedProduct]: """Get External Resource as an Array. .. seealso:: @@ -175,12 +175,12 @@ async def get_array(self, **kwargs: Any) -> List[_models.FlattenedProduct]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.FlattenedProduct]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.FlattenedProduct]] = kwargs.pop("cls", None) _request = build_get_array_request( headers=_headers, @@ -210,7 +210,7 @@ async def get_array(self, **kwargs: Any) -> List[_models.FlattenedProduct]: @overload async def put_wrapped_array( self, - resource_array: Optional[List[_models.WrappedProduct]] = None, + resource_array: Optional[list[_models.WrappedProduct]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -253,7 +253,7 @@ async def put_wrapped_array( @distributed_trace_async async def put_wrapped_array( - self, resource_array: Optional[Union[List[_models.WrappedProduct], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[_models.WrappedProduct], IO[bytes]]] = None, **kwargs: Any ) -> None: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -274,7 +274,7 @@ async def put_wrapped_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -318,7 +318,7 @@ async def put_wrapped_array( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_wrapped_array(self, **kwargs: Any) -> List[_models.ProductWrapper]: + async def get_wrapped_array(self, **kwargs: Any) -> list[_models.ProductWrapper]: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -335,12 +335,12 @@ async def get_wrapped_array(self, **kwargs: Any) -> List[_models.ProductWrapper] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.ProductWrapper]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.ProductWrapper]] = kwargs.pop("cls", None) _request = build_get_wrapped_array_request( headers=_headers, @@ -370,7 +370,7 @@ async def get_wrapped_array(self, **kwargs: Any) -> List[_models.ProductWrapper] @overload async def put_dictionary( self, - resource_dictionary: Optional[Dict[str, _models.FlattenedProduct]] = None, + resource_dictionary: Optional[dict[str, _models.FlattenedProduct]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -411,7 +411,7 @@ async def put_dictionary( @distributed_trace_async async def put_dictionary( - self, resource_dictionary: Optional[Union[Dict[str, _models.FlattenedProduct], IO[bytes]]] = None, **kwargs: Any + self, resource_dictionary: Optional[Union[dict[str, _models.FlattenedProduct], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as a Dictionary. @@ -431,7 +431,7 @@ async def put_dictionary( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -475,7 +475,7 @@ async def put_dictionary( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary(self, **kwargs: Any) -> Dict[str, _models.FlattenedProduct]: + async def get_dictionary(self, **kwargs: Any) -> dict[str, _models.FlattenedProduct]: """Get External Resource as a Dictionary. .. seealso:: @@ -491,12 +491,12 @@ async def get_dictionary(self, **kwargs: Any) -> Dict[str, _models.FlattenedProd 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.FlattenedProduct]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.FlattenedProduct]] = kwargs.pop("cls", None) _request = build_get_dictionary_request( headers=_headers, @@ -593,7 +593,7 @@ async def put_resource_collection( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -653,7 +653,7 @@ async def get_resource_collection(self, **kwargs: Any) -> _models.ResourceCollec 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -749,7 +749,7 @@ async def put_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -837,7 +837,7 @@ async def post_flattened_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -906,7 +906,7 @@ async def put_simple_product_with_grouping( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_models_py3.py index 80966428f5b..cdbb3b9c87b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Dict, List, Literal, Optional, TYPE_CHECKING +from typing import Any, Literal, Optional, TYPE_CHECKING from .._utils import serialization as _serialization @@ -120,7 +120,7 @@ class Resource(_serialization.Model): "name": {"key": "name", "type": "str"}, } - def __init__(self, *, tags: Optional[Dict[str, str]] = None, location: Optional[str] = None, **kwargs: Any) -> None: + def __init__(self, *, tags: Optional[dict[str, str]] = None, location: Optional[str] = None, **kwargs: Any) -> None: """ :keyword tags: Dictionary of :code:``. :paramtype tags: dict[str, str] @@ -184,7 +184,7 @@ class FlattenedProduct(Resource): def __init__( self, *, - tags: Optional[Dict[str, str]] = None, + tags: Optional[dict[str, str]] = None, location: Optional[str] = None, p_name: Optional[str] = None, type_properties_type: Optional[str] = None, @@ -385,8 +385,8 @@ def __init__( self, *, productresource: Optional["_models.FlattenedProduct"] = None, - arrayofresources: Optional[List["_models.FlattenedProduct"]] = None, - dictionaryofresources: Optional[Dict[str, "_models.FlattenedProduct"]] = None, + arrayofresources: Optional[list["_models.FlattenedProduct"]] = None, + dictionaryofresources: Optional[dict[str, "_models.FlattenedProduct"]] = None, **kwargs: Any ) -> None: """ diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py index 4b1fc1bf58e..aedf974938a 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ModelFlattening/modelflattening/operations/_auto_rest_resource_flattening_test_service_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Literal, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -225,7 +225,7 @@ class _AutoRestResourceFlatteningTestServiceOperationsMixin( @overload def put_array( self, - resource_array: Optional[List[_models.Resource]] = None, + resource_array: Optional[list[_models.Resource]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -266,7 +266,7 @@ def put_array( @distributed_trace def put_array( # pylint: disable=inconsistent-return-statements - self, resource_array: Optional[Union[List[_models.Resource], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[_models.Resource], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as an Array. @@ -286,7 +286,7 @@ def put_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ def put_array( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array(self, **kwargs: Any) -> List[_models.FlattenedProduct]: + def get_array(self, **kwargs: Any) -> list[_models.FlattenedProduct]: """Get External Resource as an Array. .. seealso:: @@ -346,12 +346,12 @@ def get_array(self, **kwargs: Any) -> List[_models.FlattenedProduct]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.FlattenedProduct]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.FlattenedProduct]] = kwargs.pop("cls", None) _request = build_get_array_request( headers=_headers, @@ -381,7 +381,7 @@ def get_array(self, **kwargs: Any) -> List[_models.FlattenedProduct]: @overload def put_wrapped_array( self, - resource_array: Optional[List[_models.WrappedProduct]] = None, + resource_array: Optional[list[_models.WrappedProduct]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -424,7 +424,7 @@ def put_wrapped_array( @distributed_trace def put_wrapped_array( # pylint: disable=inconsistent-return-statements - self, resource_array: Optional[Union[List[_models.WrappedProduct], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[_models.WrappedProduct], IO[bytes]]] = None, **kwargs: Any ) -> None: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -445,7 +445,7 @@ def put_wrapped_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -489,7 +489,7 @@ def put_wrapped_array( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_wrapped_array(self, **kwargs: Any) -> List[_models.ProductWrapper]: + def get_wrapped_array(self, **kwargs: Any) -> list[_models.ProductWrapper]: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -506,12 +506,12 @@ def get_wrapped_array(self, **kwargs: Any) -> List[_models.ProductWrapper]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.ProductWrapper]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.ProductWrapper]] = kwargs.pop("cls", None) _request = build_get_wrapped_array_request( headers=_headers, @@ -541,7 +541,7 @@ def get_wrapped_array(self, **kwargs: Any) -> List[_models.ProductWrapper]: @overload def put_dictionary( self, - resource_dictionary: Optional[Dict[str, _models.FlattenedProduct]] = None, + resource_dictionary: Optional[dict[str, _models.FlattenedProduct]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -582,7 +582,7 @@ def put_dictionary( @distributed_trace def put_dictionary( # pylint: disable=inconsistent-return-statements - self, resource_dictionary: Optional[Union[Dict[str, _models.FlattenedProduct], IO[bytes]]] = None, **kwargs: Any + self, resource_dictionary: Optional[Union[dict[str, _models.FlattenedProduct], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as a Dictionary. @@ -602,7 +602,7 @@ def put_dictionary( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -646,7 +646,7 @@ def put_dictionary( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary(self, **kwargs: Any) -> Dict[str, _models.FlattenedProduct]: + def get_dictionary(self, **kwargs: Any) -> dict[str, _models.FlattenedProduct]: """Get External Resource as a Dictionary. .. seealso:: @@ -662,12 +662,12 @@ def get_dictionary(self, **kwargs: Any) -> Dict[str, _models.FlattenedProduct]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.FlattenedProduct]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.FlattenedProduct]] = kwargs.pop("cls", None) _request = build_get_dictionary_request( headers=_headers, @@ -764,7 +764,7 @@ def put_resource_collection( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -824,7 +824,7 @@ def get_resource_collection(self, **kwargs: Any) -> _models.ResourceCollection: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -920,7 +920,7 @@ def put_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1008,7 +1008,7 @@ def post_flattened_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1077,7 +1077,7 @@ def put_simple_product_with_grouping( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py index c8d2fb060a7..44565a89647 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/aio/operations/_multiple_inheritance_service_client_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -41,7 +41,7 @@ from .._configuration import MultipleInheritanceServiceClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MultipleInheritanceServiceClientOperationsMixin( @@ -62,7 +62,7 @@ async def get_horse(self, **kwargs: Any) -> _models.Horse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ async def put_horse(self, horse: Union[_models.Horse, IO[bytes]], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -196,7 +196,7 @@ async def get_pet(self, **kwargs: Any) -> _models.Pet: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -244,7 +244,7 @@ async def put_pet(self, name: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -295,7 +295,7 @@ async def get_feline(self, **kwargs: Any) -> _models.Feline: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -372,7 +372,7 @@ async def put_feline(self, feline: Union[_models.Feline, IO[bytes]], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -429,7 +429,7 @@ async def get_cat(self, **kwargs: Any) -> _models.Cat: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -508,7 +508,7 @@ async def put_cat(self, cat: Union[_models.Cat, IO[bytes]], **kwargs: Any) -> st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -566,7 +566,7 @@ async def get_kitten(self, **kwargs: Any) -> _models.Kitten: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -648,7 +648,7 @@ async def put_kitten(self, kitten: Union[_models.Kitten, IO[bytes]], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py index ac0b8facdeb..8fe359a3d2c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/MultipleInheritance/multipleinheritance/operations/_multiple_inheritance_service_client_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -208,7 +208,7 @@ def get_horse(self, **kwargs: Any) -> _models.Horse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -285,7 +285,7 @@ def put_horse(self, horse: Union[_models.Horse, IO[bytes]], **kwargs: Any) -> st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -342,7 +342,7 @@ def get_pet(self, **kwargs: Any) -> _models.Pet: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -390,7 +390,7 @@ def put_pet(self, name: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -441,7 +441,7 @@ def get_feline(self, **kwargs: Any) -> _models.Feline: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -518,7 +518,7 @@ def put_feline(self, feline: Union[_models.Feline, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -575,7 +575,7 @@ def get_cat(self, **kwargs: Any) -> _models.Cat: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -654,7 +654,7 @@ def put_cat(self, cat: Union[_models.Cat, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -712,7 +712,7 @@ def get_kitten(self, **kwargs: Any) -> _models.Kitten: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -794,7 +794,7 @@ def put_kitten(self, kitten: Union[_models.Kitten, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NoOperations/nooperations/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NoOperations/nooperations/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NoOperations/nooperations/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NoOperations/nooperations/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_non_string_enums_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_non_string_enums_client.py index 3b35778d3d0..74365294126 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_non_string_enums_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_non_string_enums_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -54,7 +54,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py index 12153721831..04e9f183583 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/_non_string_enums_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -54,7 +54,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_float_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_float_operations.py index 2a43288f3e8..f2ef5fb6935 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_float_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_float_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import NonStringEnumsClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FloatOperations: @@ -65,7 +65,7 @@ async def put(self, input: Optional[Union[float, _models.FloatEnum]] = None, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -118,7 +118,7 @@ async def get(self, **kwargs: Any) -> Union[float, _models.FloatEnum]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_int_operations_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_int_operations_operations.py index 0d4ac168f77..7d6040ca755 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_int_operations_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/aio/operations/_int_operations_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import NonStringEnumsClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class IntOperations: @@ -65,7 +65,7 @@ async def put(self, input: Optional[Union[int, _models.IntEnum]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -118,7 +118,7 @@ async def get(self, **kwargs: Any) -> Union[int, _models.IntEnum]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_float_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_float_operations.py index 7aa23a229ca..64da01a1d6f 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_float_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_float_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -98,7 +98,7 @@ def put(self, input: Optional[Union[float, _models.FloatEnum]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -151,7 +151,7 @@ def get(self, **kwargs: Any) -> Union[float, _models.FloatEnum]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_int_operations_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_int_operations_operations.py index e702fd15e9f..46ab3b6ee2c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_int_operations_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/NonStringEnums/nonstringenums/operations/_int_operations_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -98,7 +98,7 @@ def put(self, input: Optional[Union[int, _models.IntEnum]] = None, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -151,7 +151,7 @@ def get(self, **kwargs: Any) -> Union[int, _models.IntEnum]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_object_type_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_object_type_client.py index 8fddf9ee201..6ed66d73c1f 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_object_type_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_object_type_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -50,7 +50,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py index 87e6eb4327e..c73b6f2acff 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/_object_type_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -50,7 +50,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/_object_type_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/_object_type_client_operations.py index 00a8d96f4e7..ba228b05b84 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/_object_type_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/aio/operations/_object_type_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ObjectTypeClientOperationsMixin( @@ -51,7 +51,7 @@ async def get(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -101,7 +101,7 @@ async def put(self, put_object: JSON, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/operations/_object_type_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/operations/_object_type_client_operations.py index d1fbef0ccce..6e1030c73a5 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/operations/_object_type_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ObjectType/objecttype/operations/_object_type_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def get(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -134,7 +134,7 @@ def put(self, put_object: JSON, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_anything_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_anything_client.py index c438a07d97a..7b3c2099c60 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_anything_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_anything_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -51,7 +51,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/_anything_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/_anything_client.py index d5809c12117..588e256c8af 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/_anything_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/_anything_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -51,7 +51,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/operations/_anything_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/operations/_anything_client_operations.py index bef40570451..de3420c5b03 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/operations/_anything_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/aio/operations/_anything_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AnythingClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AnythingClientOperationsMixin( @@ -57,7 +57,7 @@ async def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -105,7 +105,7 @@ async def put_object(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -151,7 +151,7 @@ async def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -199,7 +199,7 @@ async def put_string(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -245,7 +245,7 @@ async def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -293,7 +293,7 @@ async def put_array(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/operations/_anything_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/operations/_anything_client_operations.py index 6bc7e474e30..651e3819d5c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/operations/_anything_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/PackageModeDataPlane/packagemode/operations/_anything_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -136,7 +136,7 @@ def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ def put_object(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -230,7 +230,7 @@ def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -278,7 +278,7 @@ def put_string(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -324,7 +324,7 @@ def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -372,7 +372,7 @@ def put_array(self, input: Any, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/_availability_sets_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/_availability_sets_operations.py index c0feec48526..69f3fa55e1b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/_availability_sets_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/aio/operations/_availability_sets_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import AutoRestParameterFlatteningConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class AvailabilitySetsOperations: @@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def update(self, resource_group_name: str, avset: str, tags: Dict[str, str], **kwargs: Any) -> None: + async def update(self, resource_group_name: str, avset: str, tags: dict[str, str], **kwargs: Any) -> None: """Updates the tags for an availability set. :param resource_group_name: The name of the resource group. Required. @@ -72,7 +72,7 @@ async def update(self, resource_group_name: str, avset: str, tags: Dict[str, str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/models/_models_py3.py index e612cb0fb25..33a6b57ad57 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, Dict +from typing import Any from .._utils import serialization as _serialization @@ -28,7 +28,7 @@ class AvailabilitySetUpdateParameters(_serialization.Model): "tags": {"key": "tags", "type": "{str}"}, } - def __init__(self, *, tags: Dict[str, str], **kwargs: Any) -> None: + def __init__(self, *, tags: dict[str, str], **kwargs: Any) -> None: """ :keyword tags: A description about the set of tags. Required. :paramtype tags: dict[str, str] diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/operations/_availability_sets_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/operations/_availability_sets_operations.py index 13ed3c99a39..ff04f987684 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/operations/_availability_sets_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterFlattening/parameterflattening/operations/_availability_sets_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -76,7 +76,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace def update( # pylint: disable=inconsistent-return-statements - self, resource_group_name: str, avset: str, tags: Dict[str, str], **kwargs: Any + self, resource_group_name: str, avset: str, tags: dict[str, str], **kwargs: Any ) -> None: """Updates the tags for an availability set. @@ -96,7 +96,7 @@ def update( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_parmaterized_endpoint_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_parmaterized_endpoint_client.py index 3763a3eeb3c..4b84947fb63 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_parmaterized_endpoint_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_parmaterized_endpoint_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -53,7 +53,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/_parmaterized_endpoint_client.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/_parmaterized_endpoint_client.py index cfdae1b3bbe..6018ae90239 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/_parmaterized_endpoint_client.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/_parmaterized_endpoint_client.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -53,7 +53,7 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/operations/_parmaterized_endpoint_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/operations/_parmaterized_endpoint_client_operations.py index 4a053007aff..5941befe990 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/operations/_parmaterized_endpoint_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/aio/operations/_parmaterized_endpoint_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import ParmaterizedEndpointClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ParmaterizedEndpointClientOperationsMixin( @@ -48,7 +48,7 @@ async def get(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/operations/_parmaterized_endpoint_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/operations/_parmaterized_endpoint_client_operations.py index 7893d9f8a46..c274f7c6f91 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/operations/_parmaterized_endpoint_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ParameterizedEndpoint/parameterizedendpoint/operations/_parmaterized_endpoint_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/aio/operations/_auto_rest_report_service_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/aio/operations/_auto_rest_report_service_operations.py index 4742dcf9026..7ca4cd387fa 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/aio/operations/_auto_rest_report_service_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/aio/operations/_auto_rest_report_service_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import AutoRestReportServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestReportServiceOperationsMixin( @@ -39,7 +39,7 @@ class _AutoRestReportServiceOperationsMixin( ): @distributed_trace_async - async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :param qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' in @@ -56,12 +56,12 @@ async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_report_request( qualifier=qualifier, @@ -90,7 +90,7 @@ async def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Di return deserialized # type: ignore @distributed_trace_async - async def get_optional_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + async def get_optional_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get optional test coverage report. :param qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' in @@ -107,12 +107,12 @@ async def get_optional_report(self, qualifier: Optional[str] = None, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_optional_report_request( qualifier=qualifier, diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/operations/_auto_rest_report_service_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/operations/_auto_rest_report_service_operations.py index 48bbc146022..15364a00dda 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/operations/_auto_rest_report_service_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Report/report/operations/_auto_rest_report_service_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -77,7 +77,7 @@ class _AutoRestReportServiceOperationsMixin( ): @distributed_trace - def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :param qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' in @@ -94,12 +94,12 @@ def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_report_request( qualifier=qualifier, @@ -128,7 +128,7 @@ def get_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str return deserialized # type: ignore @distributed_trace - def get_optional_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + def get_optional_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get optional test coverage report. :param qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' in @@ -145,12 +145,12 @@ def get_optional_report(self, qualifier: Optional[str] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_get_optional_report_request( qualifier=qualifier, diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py index 0ff01136fd1..452c2a0ab45 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_explicit_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -56,7 +56,7 @@ from .._configuration import AutoRestRequiredOptionalTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ExplicitOperations: # pylint: disable=too-many-public-methods @@ -96,7 +96,7 @@ async def put_optional_binary_body(self, body_parameter: Optional[IO[bytes]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def put_required_binary_body(self, body_parameter: IO[bytes], **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -195,7 +195,7 @@ async def post_required_integer_parameter(self, body_parameter: int, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -244,7 +244,7 @@ async def post_optional_integer_parameter(self, body_parameter: Optional[int] = 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -297,7 +297,7 @@ async def post_required_integer_property(self, value: int, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ async def post_optional_integer_property(self, value: Optional[int] = None, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -401,7 +401,7 @@ async def post_required_integer_header(self, header_parameter: int, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -446,7 +446,7 @@ async def post_optional_integer_header(self, header_parameter: Optional[int] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -492,7 +492,7 @@ async def post_required_string_parameter(self, body_parameter: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -541,7 +541,7 @@ async def post_optional_string_parameter(self, body_parameter: Optional[str] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -594,7 +594,7 @@ async def post_required_string_property(self, value: str, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -644,7 +644,7 @@ async def post_optional_string_property(self, value: Optional[str] = None, **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -698,7 +698,7 @@ async def post_required_string_header(self, header_parameter: str, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -743,7 +743,7 @@ async def post_optional_string_header(self, body_parameter: Optional[str] = None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -825,7 +825,7 @@ async def post_required_class_parameter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -915,7 +915,7 @@ async def post_optional_class_parameter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -975,7 +975,7 @@ async def post_required_class_property(self, value: _models.Product, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1025,7 +1025,7 @@ async def post_optional_class_property(self, value: Optional[_models.Product] = 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1064,7 +1064,7 @@ async def post_optional_class_property(self, value: Optional[_models.Product] = @overload async def post_required_array_parameter( - self, body_parameter: List[str], *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -1097,7 +1097,7 @@ async def post_required_array_parameter( """ @distributed_trace_async - async def post_required_array_parameter(self, body_parameter: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def post_required_array_parameter(self, body_parameter: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -1113,7 +1113,7 @@ async def post_required_array_parameter(self, body_parameter: Union[List[str], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1155,7 +1155,7 @@ async def post_required_array_parameter(self, body_parameter: Union[List[str], I @overload async def post_optional_array_parameter( - self, body_parameter: Optional[List[str]] = None, *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: Optional[list[str]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -1187,7 +1187,7 @@ async def post_optional_array_parameter( @distributed_trace_async async def post_optional_array_parameter( - self, body_parameter: Optional[Union[List[str], IO[bytes]]] = None, **kwargs: Any + self, body_parameter: Optional[Union[list[str], IO[bytes]]] = None, **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -1203,7 +1203,7 @@ async def post_optional_array_parameter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1247,7 +1247,7 @@ async def post_optional_array_parameter( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def post_required_array_property(self, value: List[str], **kwargs: Any) -> None: + async def post_required_array_property(self, value: list[str], **kwargs: Any) -> None: """Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent. @@ -1263,7 +1263,7 @@ async def post_required_array_property(self, value: List[str], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1298,7 +1298,7 @@ async def post_required_array_property(self, value: List[str], **kwargs: Any) -> return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def post_optional_array_property(self, value: Optional[List[str]] = None, **kwargs: Any) -> None: + async def post_optional_array_property(self, value: Optional[list[str]] = None, **kwargs: Any) -> None: """Test explicitly optional array. Please put a valid array-wrapper with 'value' = null. :param value: Default value is None. @@ -1313,7 +1313,7 @@ async def post_optional_array_property(self, value: Optional[List[str]] = None, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1351,7 +1351,7 @@ async def post_optional_array_property(self, value: Optional[List[str]] = None, return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def post_required_array_header(self, header_parameter: List[str], **kwargs: Any) -> None: + async def post_required_array_header(self, header_parameter: list[str], **kwargs: Any) -> None: """Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent. @@ -1367,7 +1367,7 @@ async def post_required_array_header(self, header_parameter: List[str], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1397,7 +1397,7 @@ async def post_required_array_header(self, header_parameter: List[str], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def post_optional_array_header(self, header_parameter: Optional[List[str]] = None, **kwargs: Any) -> None: + async def post_optional_array_header(self, header_parameter: Optional[list[str]] = None, **kwargs: Any) -> None: """Test explicitly optional integer. Please put a header 'headerParameter' => null. :param header_parameter: Default value is None. @@ -1412,7 +1412,7 @@ async def post_optional_array_header(self, header_parameter: Optional[List[str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_implicit_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_implicit_operations.py index 125a2bbb8cb..83721c69bb9 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_implicit_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/aio/operations/_implicit_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Optional, TypeVar +from typing import Any, Callable, IO, Optional, TypeVar from msrest import Deserializer, Serializer @@ -38,7 +38,7 @@ from .._configuration import AutoRestRequiredOptionalTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ImplicitOperations: @@ -78,7 +78,7 @@ async def get_required_path(self, path_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -123,7 +123,7 @@ async def put_optional_query(self, query_parameter: Optional[str] = None, **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ async def put_optional_header(self, query_parameter: Optional[str] = None, **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def put_optional_body(self, body_parameter: Optional[str] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -265,7 +265,7 @@ async def put_optional_binary_body(self, body_parameter: Optional[IO[bytes]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -312,7 +312,7 @@ async def get_required_global_path(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -355,7 +355,7 @@ async def get_required_global_query(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -398,7 +398,7 @@ async def get_optional_global_query(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/models/_models_py3.py index b5ef0ed3e28..c9b5a6651a4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Optional, TYPE_CHECKING +from typing import Any, Optional, TYPE_CHECKING import msrest.serialization @@ -25,7 +25,7 @@ class ArrayOptionalWrapper(msrest.serialization.Model): "value": {"key": "value", "type": "[str]"}, } - def __init__(self, *, value: Optional[List[str]] = None, **kwargs: Any) -> None: + def __init__(self, *, value: Optional[list[str]] = None, **kwargs: Any) -> None: """ :keyword value: :paramtype value: list[str] @@ -51,7 +51,7 @@ class ArrayWrapper(msrest.serialization.Model): "value": {"key": "value", "type": "[str]"}, } - def __init__(self, *, value: List[str], **kwargs: Any) -> None: + def __init__(self, *, value: list[str], **kwargs: Any) -> None: """ :keyword value: Required. :paramtype value: list[str] diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py index 3f664af616d..2a45a7ec2a1 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_explicit_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from msrest import Deserializer, Serializer @@ -30,7 +30,7 @@ from .._configuration import AutoRestRequiredOptionalTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -419,7 +419,7 @@ def build_post_optional_array_property_request(**kwargs: Any) -> HttpRequest: # return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) -def build_post_required_array_header_request(*, header_parameter: List[str], **kwargs: Any) -> HttpRequest: +def build_post_required_array_header_request(*, header_parameter: list[str], **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) accept = _headers.pop("Accept", "application/json") @@ -435,7 +435,7 @@ def build_post_required_array_header_request(*, header_parameter: List[str], **k def build_post_optional_array_header_request( - *, header_parameter: Optional[List[str]] = None, **kwargs: Any + *, header_parameter: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -491,7 +491,7 @@ def put_optional_binary_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -542,7 +542,7 @@ def put_required_binary_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -594,7 +594,7 @@ def post_required_integer_parameter( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -645,7 +645,7 @@ def post_optional_integer_parameter( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -700,7 +700,7 @@ def post_required_integer_property( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -752,7 +752,7 @@ def post_optional_integer_property( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -808,7 +808,7 @@ def post_required_integer_header( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -855,7 +855,7 @@ def post_optional_integer_header( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -903,7 +903,7 @@ def post_required_string_parameter( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -954,7 +954,7 @@ def post_optional_string_parameter( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1009,7 +1009,7 @@ def post_required_string_property( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1061,7 +1061,7 @@ def post_optional_string_property( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1117,7 +1117,7 @@ def post_required_string_header( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1164,7 +1164,7 @@ def post_optional_string_header( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1246,7 +1246,7 @@ def post_required_class_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1336,7 +1336,7 @@ def post_optional_class_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1398,7 +1398,7 @@ def post_required_class_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1450,7 +1450,7 @@ def post_optional_class_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1489,7 +1489,7 @@ def post_optional_class_property( # pylint: disable=inconsistent-return-stateme @overload def post_required_array_parameter( - self, body_parameter: List[str], *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -1523,7 +1523,7 @@ def post_required_array_parameter( @distributed_trace def post_required_array_parameter( # pylint: disable=inconsistent-return-statements - self, body_parameter: Union[List[str], IO[bytes]], **kwargs: Any + self, body_parameter: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -1540,7 +1540,7 @@ def post_required_array_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1582,7 +1582,7 @@ def post_required_array_parameter( # pylint: disable=inconsistent-return-statem @overload def post_optional_array_parameter( - self, body_parameter: Optional[List[str]] = None, *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: Optional[list[str]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -1614,7 +1614,7 @@ def post_optional_array_parameter( @distributed_trace def post_optional_array_parameter( # pylint: disable=inconsistent-return-statements - self, body_parameter: Optional[Union[List[str], IO[bytes]]] = None, **kwargs: Any + self, body_parameter: Optional[Union[list[str], IO[bytes]]] = None, **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -1630,7 +1630,7 @@ def post_optional_array_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1675,7 +1675,7 @@ def post_optional_array_parameter( # pylint: disable=inconsistent-return-statem @distributed_trace def post_required_array_property( # pylint: disable=inconsistent-return-statements - self, value: List[str], **kwargs: Any + self, value: list[str], **kwargs: Any ) -> None: """Test explicitly required array. Please put a valid array-wrapper with 'value' = null and the client library should throw before the request is sent. @@ -1692,7 +1692,7 @@ def post_required_array_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1728,7 +1728,7 @@ def post_required_array_property( # pylint: disable=inconsistent-return-stateme @distributed_trace def post_optional_array_property( # pylint: disable=inconsistent-return-statements - self, value: Optional[List[str]] = None, **kwargs: Any + self, value: Optional[list[str]] = None, **kwargs: Any ) -> None: """Test explicitly optional array. Please put a valid array-wrapper with 'value' = null. @@ -1744,7 +1744,7 @@ def post_optional_array_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1783,7 +1783,7 @@ def post_optional_array_property( # pylint: disable=inconsistent-return-stateme @distributed_trace def post_required_array_header( # pylint: disable=inconsistent-return-statements - self, header_parameter: List[str], **kwargs: Any + self, header_parameter: list[str], **kwargs: Any ) -> None: """Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent. @@ -1800,7 +1800,7 @@ def post_required_array_header( # pylint: disable=inconsistent-return-statement 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1831,7 +1831,7 @@ def post_required_array_header( # pylint: disable=inconsistent-return-statement @distributed_trace def post_optional_array_header( # pylint: disable=inconsistent-return-statements - self, header_parameter: Optional[List[str]] = None, **kwargs: Any + self, header_parameter: Optional[list[str]] = None, **kwargs: Any ) -> None: """Test explicitly optional integer. Please put a header 'headerParameter' => null. @@ -1847,7 +1847,7 @@ def post_optional_array_header( # pylint: disable=inconsistent-return-statement 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_implicit_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_implicit_operations.py index 43437c0e0fd..e63302cdd87 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_implicit_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/RequiredOptional/requiredoptional/operations/_implicit_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Optional, TypeVar +from typing import Any, Callable, IO, Optional, TypeVar from msrest import Deserializer, Serializer @@ -28,7 +28,7 @@ from .._configuration import AutoRestRequiredOptionalTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -218,7 +218,7 @@ def get_required_path( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -265,7 +265,7 @@ def put_optional_query( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -312,7 +312,7 @@ def put_optional_header( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -359,7 +359,7 @@ def put_optional_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -413,7 +413,7 @@ def put_optional_binary_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -460,7 +460,7 @@ def get_required_global_path(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -503,7 +503,7 @@ def get_required_global_query(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -546,7 +546,7 @@ def get_optional_global_query(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_import_operations_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_import_operations_operations.py index a63b25f8616..9e110f166cc 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_import_operations_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_import_operations_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ImportOperations: @@ -66,7 +66,7 @@ async def operation_one(self, parameter1: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_reserved_words_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_reserved_words_client_operations.py index ecf507ca19e..06a6d4cfa08 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_reserved_words_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/aio/operations/_reserved_words_client_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union +from typing import Any, Callable, IO, Optional, TypeVar, Union from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -37,7 +37,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ReservedWordsClientOperationsMixin( @@ -60,7 +60,7 @@ async def operation_with_content_param(self, content: IO[bytes], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -112,7 +112,7 @@ async def operation_with_json_param(self, json: Any, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -166,7 +166,7 @@ async def operation_with_data_param(self, data: str, world: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -226,7 +226,7 @@ async def operation_with_files_param(self, files: IO[bytes], file_name: str, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -268,7 +268,7 @@ async def operation_with_files_param(self, files: IO[bytes], file_name: str, **k @distributed_trace_async async def operation_with_url( - self, url: str, header_parameters: str, query_parameters: Optional[List[str]] = None, **kwargs: Any + self, url: str, header_parameters: str, query_parameters: Optional[list[str]] = None, **kwargs: Any ) -> JSON: """Operation with path format argument URL, header param headerParameters, and query param queryParameters. @@ -291,7 +291,7 @@ async def operation_with_url( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -342,7 +342,7 @@ async def reserved_enum(self, enum_parameter: Union[str, _models.MyEnum], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_import_operations_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_import_operations_operations.py index 833ed7dd604..61fed93665b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_import_operations_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_import_operations_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def operation_one(self, parameter1: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_reserved_words_client_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_reserved_words_client_operations.py index 2052febf036..51a74ef8f4c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_reserved_words_client_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/ReservedWords/reservedwords/operations/_reserved_words_client_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union +from typing import Any, Callable, IO, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -102,7 +102,7 @@ def build_operation_with_files_param_request(**kwargs: Any) -> HttpRequest: def build_operation_with_url_request( - url: str, *, header_parameters: str, query_parameters: Optional[List[str]] = None, **kwargs: Any + url: str, *, header_parameters: str, query_parameters: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -165,7 +165,7 @@ def operation_with_content_param(self, content: IO[bytes], **kwargs: Any) -> JSO 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -217,7 +217,7 @@ def operation_with_json_param(self, json: Any, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ def operation_with_data_param(self, data: str, world: str, **kwargs: Any) -> JSO 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -331,7 +331,7 @@ def operation_with_files_param(self, files: IO[bytes], file_name: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -373,7 +373,7 @@ def operation_with_files_param(self, files: IO[bytes], file_name: str, **kwargs: @distributed_trace def operation_with_url( - self, url: str, header_parameters: str, query_parameters: Optional[List[str]] = None, **kwargs: Any + self, url: str, header_parameters: str, query_parameters: Optional[list[str]] = None, **kwargs: Any ) -> JSON: """Operation with path format argument URL, header param headerParameters, and query param queryParameters. @@ -396,7 +396,7 @@ def operation_with_url( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -447,7 +447,7 @@ def reserved_enum(self, enum_parameter: Union[str, _models.MyEnum], **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py index b3f090786ca..fa65fdf36d7 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_autorest_security_aad.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, TYPE_CHECKING +from typing import Any, TYPE_CHECKING from typing_extensions import Self from azure.core import PipelineClient @@ -53,7 +53,7 @@ def __init__(self, credential: "TokenCredential", base_url: str = "http://localh ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py index a4a805fd14b..c27af2810dd 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/_autorest_security_aad.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, TYPE_CHECKING +from typing import Any, Awaitable, TYPE_CHECKING from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -55,7 +55,7 @@ def __init__( ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py index 13123d6731a..fc7b2ea381d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/aio/operations/_autorest_security_aad_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutorestSecurityAadConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutorestSecurityAadOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py index 400f837b049..2a7a0638950 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwagger/securityaadswagger/operations/_autorest_security_aad_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_security_aad_swagger_credential_flag.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_security_aad_swagger_credential_flag.py index 9e0133c7581..fad1770fc95 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_security_aad_swagger_credential_flag.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_security_aad_swagger_credential_flag.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -53,7 +53,7 @@ def __init__(self, credential: AzureKeyCredential, base_url: str = "http://local ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/_security_aad_swagger_credential_flag.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/_security_aad_swagger_credential_flag.py index cd4c8a4757e..eb8d6b2819d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/_security_aad_swagger_credential_flag.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/_security_aad_swagger_credential_flag.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -53,7 +53,7 @@ def __init__(self, credential: AzureKeyCredential, base_url: str = "http://local ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/operations/_security_aad_swagger_credential_flag_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/operations/_security_aad_swagger_credential_flag_operations.py index d8ed582e927..b951cd74149 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/operations/_security_aad_swagger_credential_flag_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/aio/operations/_security_aad_swagger_credential_flag_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import SecurityAadSwaggerCredentialFlagConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _SecurityAadSwaggerCredentialFlagOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/operations/_security_aad_swagger_credential_flag_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/operations/_security_aad_swagger_credential_flag_operations.py index a7d5f27cd62..e7c29c75756 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/operations/_security_aad_swagger_credential_flag_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityAadSwaggerCredentialFlag/securityaadswaggercredentialflag/operations/_security_aad_swagger_credential_flag_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py index 99842febdd2..71205f5c2f2 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_autorest_security_key.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict +from typing import Any from typing_extensions import Self from azure.core import PipelineClient @@ -51,7 +51,7 @@ def __init__(self, credential: AzureKeyCredential, base_url: str = "http://local ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py index 0ab0f2d4471..d57900c39a5 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/_autorest_security_key.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict +from typing import Any, Awaitable from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -51,7 +51,7 @@ def __init__(self, credential: AzureKeyCredential, base_url: str = "http://local ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py index 2a6c96bd93a..d83a0b85fec 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/aio/operations/_autorest_security_key_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutorestSecurityKeyConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutorestSecurityKeyOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py index 09bf782ab5c..3b41a9dbd4a 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwagger/securitykeyswagger/operations/_autorest_security_key_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_security_key_swagger_credential_flag.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_security_key_swagger_credential_flag.py index 7bca266e0ff..4edc0c2c8b4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_security_key_swagger_credential_flag.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_security_key_swagger_credential_flag.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Dict, TYPE_CHECKING +from typing import Any, TYPE_CHECKING from typing_extensions import Self from azure.core import PipelineClient @@ -55,7 +55,7 @@ def __init__(self, credential: "TokenCredential", base_url: str = "http://localh ] self._client: PipelineClient = PipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/_security_key_swagger_credential_flag.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/_security_key_swagger_credential_flag.py index 1c895c3b1af..51ce6675dc8 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/_security_key_swagger_credential_flag.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/_security_key_swagger_credential_flag.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from copy import deepcopy -from typing import Any, Awaitable, Dict, TYPE_CHECKING +from typing import Any, Awaitable, TYPE_CHECKING from typing_extensions import Self from azure.core import AsyncPipelineClient @@ -57,7 +57,7 @@ def __init__( ] self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=base_url, policies=_policies, **kwargs) - client_models: Dict[str, Any] = {} + client_models: dict[str, Any] = {} self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) self._serialize.client_side_validation = False diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/operations/_security_key_swagger_credential_flag_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/operations/_security_key_swagger_credential_flag_operations.py index fcaeef77397..36f71675d54 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/operations/_security_key_swagger_credential_flag_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/aio/operations/_security_key_swagger_credential_flag_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import SecurityKeySwaggerCredentialFlagConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _SecurityKeySwaggerCredentialFlagOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/operations/_security_key_swagger_credential_flag_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/operations/_security_key_swagger_credential_flag_operations.py index 0d300e599bf..e73bfaa6131 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/operations/_security_key_swagger_credential_flag_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/SecurityKeySwaggerCredentialFlag/securitykeyswaggercredentialflag/operations/_security_key_swagger_credential_flag_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_path_items_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_path_items_operations.py index a28397daf49..e5e2b8b92b5 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_path_items_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_path_items_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -33,7 +33,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathItemsOperations: @@ -88,7 +88,7 @@ async def get_all_with_values( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -155,7 +155,7 @@ async def get_global_query_null( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -222,7 +222,7 @@ async def get_global_and_local_query_null( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -288,7 +288,7 @@ async def get_local_path_item_query_null( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_paths_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_paths_operations.py index 8a2c5840301..e0afc40ec80 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_paths_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_paths_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from msrest import Deserializer, Serializer @@ -58,7 +58,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: # pylint: disable=too-many-public-methods @@ -94,7 +94,7 @@ async def get_boolean_true(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ async def get_boolean_false(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -182,7 +182,7 @@ async def get_int_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -226,7 +226,7 @@ async def get_int_negative_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -270,7 +270,7 @@ async def get_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -314,7 +314,7 @@ async def get_negative_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -358,7 +358,7 @@ async def float_scientific_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -402,7 +402,7 @@ async def float_scientific_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -446,7 +446,7 @@ async def double_decimal_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -490,7 +490,7 @@ async def double_decimal_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -534,7 +534,7 @@ async def string_unicode(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -578,7 +578,7 @@ async def string_url_encoded(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -624,7 +624,7 @@ async def string_url_non_encoded(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -668,7 +668,7 @@ async def string_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -714,7 +714,7 @@ async def string_null(self, string_path: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -760,7 +760,7 @@ async def enum_valid(self, enum_path: Union[str, _models.UriColor], **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -806,7 +806,7 @@ async def enum_null(self, enum_path: Union[str, _models.UriColor], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -851,7 +851,7 @@ async def byte_multi_byte(self, byte_path: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -894,7 +894,7 @@ async def byte_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -940,7 +940,7 @@ async def byte_null(self, byte_path: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -983,7 +983,7 @@ async def date_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1030,7 +1030,7 @@ async def date_null(self, date_path: datetime.date, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1073,7 +1073,7 @@ async def date_time_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1119,7 +1119,7 @@ async def date_time_null(self, date_time_path: datetime.datetime, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1164,7 +1164,7 @@ async def base64_url(self, base64_url_path: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1194,7 +1194,7 @@ async def base64_url(self, base64_url_path: bytes, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_csv_in_path(self, array_path: List[str], **kwargs: Any) -> None: + async def array_csv_in_path(self, array_path: list[str], **kwargs: Any) -> None: """Get an array of string ['ArrayPath1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -1211,7 +1211,7 @@ async def array_csv_in_path(self, array_path: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1256,7 +1256,7 @@ async def unix_time_url(self, unix_time_url_path: datetime.datetime, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_queries_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_queries_operations.py index 165348e8d07..cf13a93e9fa 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_queries_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/aio/operations/_queries_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from msrest import Deserializer, Serializer @@ -67,7 +67,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueriesOperations: # pylint: disable=too-many-public-methods @@ -103,7 +103,7 @@ async def get_boolean_true(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -147,7 +147,7 @@ async def get_boolean_false(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -193,7 +193,7 @@ async def get_boolean_null(self, bool_query: Optional[bool] = None, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -236,7 +236,7 @@ async def get_int_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -280,7 +280,7 @@ async def get_int_negative_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -326,7 +326,7 @@ async def get_int_null(self, int_query: Optional[int] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -369,7 +369,7 @@ async def get_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -413,7 +413,7 @@ async def get_negative_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -459,7 +459,7 @@ async def get_long_null(self, long_query: Optional[int] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -502,7 +502,7 @@ async def float_scientific_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -546,7 +546,7 @@ async def float_scientific_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -592,7 +592,7 @@ async def float_null(self, float_query: Optional[float] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -635,7 +635,7 @@ async def double_decimal_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -679,7 +679,7 @@ async def double_decimal_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -725,7 +725,7 @@ async def double_null(self, double_query: Optional[float] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -768,7 +768,7 @@ async def string_unicode(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -814,7 +814,7 @@ async def string_url_encoded(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -860,7 +860,7 @@ async def string_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -906,7 +906,7 @@ async def string_null(self, string_query: Optional[str] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -952,7 +952,7 @@ async def enum_valid(self, enum_query: Optional[Union[str, _models.UriColor]] = 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -998,7 +998,7 @@ async def enum_null(self, enum_query: Optional[Union[str, _models.UriColor]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1044,7 +1044,7 @@ async def byte_multi_byte(self, byte_query: Optional[bytes] = None, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1087,7 +1087,7 @@ async def byte_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1133,7 +1133,7 @@ async def byte_null(self, byte_query: Optional[bytes] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1176,7 +1176,7 @@ async def date_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1222,7 +1222,7 @@ async def date_null(self, date_query: Optional[datetime.date] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1265,7 +1265,7 @@ async def date_time_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1313,7 +1313,7 @@ async def date_time_null(self, date_time_query: Optional[datetime.datetime] = No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1343,7 +1343,7 @@ async def date_time_null(self, date_time_query: Optional[datetime.datetime] = No return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_csv_valid(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_csv_valid(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -1360,7 +1360,7 @@ async def array_string_csv_valid(self, array_query: Optional[List[str]] = None, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1390,7 +1390,7 @@ async def array_string_csv_valid(self, array_query: Optional[List[str]] = None, return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_csv_null(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_csv_null(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get a null array of string using the csv-array format. :param array_query: a null array of string using the csv-array format. Default value is None. @@ -1405,7 +1405,7 @@ async def array_string_csv_null(self, array_query: Optional[List[str]] = None, * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1435,7 +1435,7 @@ async def array_string_csv_null(self, array_query: Optional[List[str]] = None, * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_csv_empty(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_csv_empty(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an empty array [] of string using the csv-array format. :param array_query: an empty array [] of string using the csv-array format. Default value is @@ -1451,7 +1451,7 @@ async def array_string_csv_empty(self, array_query: Optional[List[str]] = None, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1482,7 +1482,7 @@ async def array_string_csv_empty(self, array_query: Optional[List[str]] = None, @distributed_trace_async async def array_string_no_collection_format_empty( - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Array query has no defined collection format, should default to csv. Pass in ['hello', 'nihao', 'bonjour'] for the 'arrayQuery' parameter to the service. @@ -1500,7 +1500,7 @@ async def array_string_no_collection_format_empty( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1530,7 +1530,7 @@ async def array_string_no_collection_format_empty( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_ssv_valid(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_ssv_valid(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format. @@ -1547,7 +1547,7 @@ async def array_string_ssv_valid(self, array_query: Optional[List[str]] = None, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1577,7 +1577,7 @@ async def array_string_ssv_valid(self, array_query: Optional[List[str]] = None, return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_tsv_valid(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_tsv_valid(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format. @@ -1594,7 +1594,7 @@ async def array_string_tsv_valid(self, array_query: Optional[List[str]] = None, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1624,7 +1624,7 @@ async def array_string_tsv_valid(self, array_query: Optional[List[str]] = None, return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_pipes_valid(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_pipes_valid(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format. @@ -1641,7 +1641,7 @@ async def array_string_pipes_valid(self, array_query: Optional[List[str]] = None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_path_items_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_path_items_operations.py index 4bcc1948cb3..90ab9a278dc 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_path_items_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_path_items_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from msrest import Deserializer, Serializer @@ -29,7 +29,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -254,7 +254,7 @@ def get_all_with_values( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -321,7 +321,7 @@ def get_global_query_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -388,7 +388,7 @@ def get_global_and_local_query_null( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -454,7 +454,7 @@ def get_local_path_item_query_null( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_paths_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_paths_operations.py index 618a0084e42..abef807be05 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_paths_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_paths_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from msrest import Deserializer, Serializer @@ -30,7 +30,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -529,7 +529,7 @@ def build_base64_url_request(base64_url_path: bytes, **kwargs: Any) -> HttpReque return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) -def build_array_csv_in_path_request(array_path: List[str], **kwargs: Any) -> HttpRequest: +def build_array_csv_in_path_request(array_path: list[str], **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) accept = _headers.pop("Accept", "application/json") @@ -603,7 +603,7 @@ def get_boolean_true(self, **kwargs: Any) -> None: # pylint: disable=inconsiste 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -647,7 +647,7 @@ def get_boolean_false(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -691,7 +691,7 @@ def get_int_one_million(self, **kwargs: Any) -> None: # pylint: disable=inconsi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -735,7 +735,7 @@ def get_int_negative_one_million(self, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -779,7 +779,7 @@ def get_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -823,7 +823,7 @@ def get_negative_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -867,7 +867,7 @@ def float_scientific_positive(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -911,7 +911,7 @@ def float_scientific_negative(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -955,7 +955,7 @@ def double_decimal_positive(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -999,7 +999,7 @@ def double_decimal_negative(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1043,7 +1043,7 @@ def string_unicode(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1087,7 +1087,7 @@ def string_url_encoded(self, **kwargs: Any) -> None: # pylint: disable=inconsis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1133,7 +1133,7 @@ def string_url_non_encoded(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1177,7 +1177,7 @@ def string_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1223,7 +1223,7 @@ def string_null(self, string_path: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1271,7 +1271,7 @@ def enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1319,7 +1319,7 @@ def enum_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1366,7 +1366,7 @@ def byte_multi_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1409,7 +1409,7 @@ def byte_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1455,7 +1455,7 @@ def byte_null(self, byte_path: bytes, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1498,7 +1498,7 @@ def date_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1547,7 +1547,7 @@ def date_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1590,7 +1590,7 @@ def date_time_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1638,7 +1638,7 @@ def date_time_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1685,7 +1685,7 @@ def base64_url( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1716,7 +1716,7 @@ def base64_url( # pylint: disable=inconsistent-return-statements @distributed_trace def array_csv_in_path( # pylint: disable=inconsistent-return-statements - self, array_path: List[str], **kwargs: Any + self, array_path: list[str], **kwargs: Any ) -> None: """Get an array of string ['ArrayPath1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -1734,7 +1734,7 @@ def array_csv_in_path( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1781,7 +1781,7 @@ def unix_time_url( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_queries_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_queries_operations.py index af3cfe83123..7854aea5987 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_queries_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Url/url/operations/_queries_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar, Union +from typing import Any, Callable, Literal, Optional, TypeVar, Union from msrest import Deserializer, Serializer @@ -30,7 +30,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -577,7 +577,7 @@ def build_date_time_null_request(*, date_time_query: Optional[datetime.datetime] return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_csv_valid_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_csv_valid_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -596,7 +596,7 @@ def build_array_string_csv_valid_request(*, array_query: Optional[List[str]] = N return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_csv_null_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_csv_null_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -615,7 +615,7 @@ def build_array_string_csv_null_request(*, array_query: Optional[List[str]] = No return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_csv_empty_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_csv_empty_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -635,7 +635,7 @@ def build_array_string_csv_empty_request(*, array_query: Optional[List[str]] = N def build_array_string_no_collection_format_empty_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -655,7 +655,7 @@ def build_array_string_no_collection_format_empty_request( # pylint: disable=na return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_ssv_valid_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_ssv_valid_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -674,7 +674,7 @@ def build_array_string_ssv_valid_request(*, array_query: Optional[List[str]] = N return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_tsv_valid_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_tsv_valid_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -693,7 +693,7 @@ def build_array_string_tsv_valid_request(*, array_query: Optional[List[str]] = N return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_pipes_valid_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_pipes_valid_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -745,7 +745,7 @@ def get_boolean_true(self, **kwargs: Any) -> None: # pylint: disable=inconsiste 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -789,7 +789,7 @@ def get_boolean_false(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -837,7 +837,7 @@ def get_boolean_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -880,7 +880,7 @@ def get_int_one_million(self, **kwargs: Any) -> None: # pylint: disable=inconsi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -924,7 +924,7 @@ def get_int_negative_one_million(self, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -972,7 +972,7 @@ def get_int_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1015,7 +1015,7 @@ def get_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1059,7 +1059,7 @@ def get_negative_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1107,7 +1107,7 @@ def get_long_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1150,7 +1150,7 @@ def float_scientific_positive(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1194,7 +1194,7 @@ def float_scientific_negative(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1242,7 +1242,7 @@ def float_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1285,7 +1285,7 @@ def double_decimal_positive(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1329,7 +1329,7 @@ def double_decimal_negative(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1377,7 +1377,7 @@ def double_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1420,7 +1420,7 @@ def string_unicode(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1466,7 +1466,7 @@ def string_url_encoded(self, **kwargs: Any) -> None: # pylint: disable=inconsis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1512,7 +1512,7 @@ def string_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1560,7 +1560,7 @@ def string_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1608,7 +1608,7 @@ def enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1656,7 +1656,7 @@ def enum_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1704,7 +1704,7 @@ def byte_multi_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1747,7 +1747,7 @@ def byte_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1795,7 +1795,7 @@ def byte_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1838,7 +1838,7 @@ def date_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1886,7 +1886,7 @@ def date_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1929,7 +1929,7 @@ def date_time_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1979,7 +1979,7 @@ def date_time_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2010,7 +2010,7 @@ def date_time_null( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_csv_valid( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -2028,7 +2028,7 @@ def array_string_csv_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2059,7 +2059,7 @@ def array_string_csv_valid( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_csv_null( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get a null array of string using the csv-array format. @@ -2075,7 +2075,7 @@ def array_string_csv_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2106,7 +2106,7 @@ def array_string_csv_null( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_csv_empty( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an empty array [] of string using the csv-array format. @@ -2123,7 +2123,7 @@ def array_string_csv_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2154,7 +2154,7 @@ def array_string_csv_empty( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_no_collection_format_empty( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Array query has no defined collection format, should default to csv. Pass in ['hello', 'nihao', 'bonjour'] for the 'arrayQuery' parameter to the service. @@ -2172,7 +2172,7 @@ def array_string_no_collection_format_empty( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2203,7 +2203,7 @@ def array_string_no_collection_format_empty( # pylint: disable=inconsistent-ret @distributed_trace def array_string_ssv_valid( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format. @@ -2221,7 +2221,7 @@ def array_string_ssv_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2252,7 +2252,7 @@ def array_string_ssv_valid( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_tsv_valid( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format. @@ -2270,7 +2270,7 @@ def array_string_tsv_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2301,7 +2301,7 @@ def array_string_tsv_valid( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_pipes_valid( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format. @@ -2319,7 +2319,7 @@ def array_string_pipes_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/_queries_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/_queries_operations.py index a21f48379b4..26e6e08428c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/_queries_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/aio/operations/_queries_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import AutoRestUrlMutliCollectionFormatTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueriesOperations: @@ -56,7 +56,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def array_string_multi_null(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_multi_null(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get a null array of string using the multi-array format. :param array_query: a null array of string using the multi-array format. Default value is None. @@ -71,7 +71,7 @@ async def array_string_multi_null(self, array_query: Optional[List[str]] = None, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -101,7 +101,7 @@ async def array_string_multi_null(self, array_query: Optional[List[str]] = None, return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_multi_empty(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_multi_empty(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an empty array [] of string using the multi-array format. :param array_query: an empty array [] of string using the multi-array format. Default value is @@ -117,7 +117,7 @@ async def array_string_multi_empty(self, array_query: Optional[List[str]] = None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -147,7 +147,7 @@ async def array_string_multi_empty(self, array_query: Optional[List[str]] = None return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_multi_valid(self, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_multi_valid(self, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the mult-array format. @@ -164,7 +164,7 @@ async def array_string_multi_valid(self, array_query: Optional[List[str]] = None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/operations/_queries_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/operations/_queries_operations.py index 4c1c6d5da52..ad04b9f5456 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/operations/_queries_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/UrlMultiCollectionFormat/urlmulticollectionformat/operations/_queries_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,13 +27,13 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -def build_array_string_multi_null_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_multi_null_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -54,7 +54,7 @@ def build_array_string_multi_null_request(*, array_query: Optional[List[str]] = return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_multi_empty_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_multi_empty_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -75,7 +75,7 @@ def build_array_string_multi_empty_request(*, array_query: Optional[List[str]] = return HttpRequest(method="GET", url=_url, params=_params, headers=_headers, **kwargs) -def build_array_string_multi_valid_request(*, array_query: Optional[List[str]] = None, **kwargs: Any) -> HttpRequest: +def build_array_string_multi_valid_request(*, array_query: Optional[list[str]] = None, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -119,7 +119,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace def array_string_multi_null( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get a null array of string using the multi-array format. @@ -135,7 +135,7 @@ def array_string_multi_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -166,7 +166,7 @@ def array_string_multi_null( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_multi_empty( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an empty array [] of string using the multi-array format. @@ -183,7 +183,7 @@ def array_string_multi_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -214,7 +214,7 @@ def array_string_multi_empty( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_multi_valid( # pylint: disable=inconsistent-return-statements - self, array_query: Optional[List[str]] = None, **kwargs: Any + self, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the mult-array format. @@ -232,7 +232,7 @@ def array_string_multi_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py index b66856f540f..84eeb83eab6 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/aio/operations/_auto_rest_validation_test_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AutoRestValidationTestConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestValidationTestOperationsMixin( @@ -63,7 +63,7 @@ async def validation_of_method_parameters( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -177,7 +177,7 @@ async def validation_of_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -243,7 +243,7 @@ async def get_with_constant_in_path(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -322,7 +322,7 @@ async def post_with_constant_in_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/models/_models_py3.py index 9722f402934..20b960b7206 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/models/_models_py3.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from typing import Any, List, Literal, Optional, TYPE_CHECKING +from typing import Any, Literal, Optional, TYPE_CHECKING import msrest.serialization @@ -167,7 +167,7 @@ def __init__( *, child: "_models.ChildProduct", const_child: "_models.ConstantProduct", - display_names: Optional[List[str]] = None, + display_names: Optional[list[str]] = None, capacity: Optional[int] = None, image: Optional[str] = None, const_string_as_enum: Optional[Literal["constant_string_as_enum"]] = None, diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py index 9e614a2cf7b..f7e12605491 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Validation/validation/operations/_auto_rest_validation_test_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload from msrest import Serializer @@ -30,7 +30,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() @@ -157,7 +157,7 @@ def validation_of_method_parameters(self, resource_group_name: str, id: int, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -271,7 +271,7 @@ def validation_of_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -337,7 +337,7 @@ def get_with_constant_in_path(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -416,7 +416,7 @@ def post_with_constant_in_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py index 2afe03e2b6c..e66bcfa406b 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/aio/operations/_xml_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -64,7 +64,7 @@ from .._configuration import AutoRestSwaggerBATXMLServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class XmlOperations: # pylint: disable=too-many-public-methods @@ -102,7 +102,7 @@ async def get_complex_type_ref_no_meta(self, **kwargs: Any) -> _models.RootWithR 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -149,7 +149,7 @@ async def put_complex_type_ref_no_meta(self, model: _models.RootWithRefAndNoMeta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -195,7 +195,7 @@ async def get_complex_type_ref_with_meta(self, **kwargs: Any) -> _models.RootWit 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -242,7 +242,7 @@ async def put_complex_type_ref_with_meta(self, model: _models.RootWithRefAndMeta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -288,7 +288,7 @@ async def get_simple(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -336,7 +336,7 @@ async def put_simple(self, slideshow: _models.Slideshow, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -383,7 +383,7 @@ async def get_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -430,7 +430,7 @@ async def put_wrapped_lists(self, wrapped_lists: _models.AppleBarrel, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -477,7 +477,7 @@ async def get_headers(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -521,7 +521,7 @@ async def get_empty_list(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -568,7 +568,7 @@ async def put_empty_list(self, slideshow: _models.Slideshow, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -614,7 +614,7 @@ async def get_empty_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -661,7 +661,7 @@ async def put_empty_wrapped_lists(self, apple_barrel: _models.AppleBarrel, **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -694,7 +694,7 @@ async def put_empty_wrapped_lists(self, apple_barrel: _models.AppleBarrel, **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: + async def get_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list as the root element. :return: list of Banana or the result of cls(response) @@ -707,12 +707,12 @@ async def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_get_root_list_request( headers=_headers, @@ -739,7 +739,7 @@ async def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: return deserialized # type: ignore @distributed_trace_async - async def put_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> None: + async def put_root_list(self, bananas: list[_models.Banana], **kwargs: Any) -> None: """Puts a list as the root element. :param bananas: Required. @@ -754,7 +754,7 @@ async def put_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -788,7 +788,7 @@ async def put_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> N return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: + async def get_root_list_single_item(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list with a single item. :return: list of Banana or the result of cls(response) @@ -801,12 +801,12 @@ async def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_get_root_list_single_item_request( headers=_headers, @@ -833,7 +833,7 @@ async def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana] return deserialized # type: ignore @distributed_trace_async - async def put_root_list_single_item(self, bananas: List[_models.Banana], **kwargs: Any) -> None: + async def put_root_list_single_item(self, bananas: list[_models.Banana], **kwargs: Any) -> None: """Puts a list with a single item. :param bananas: Required. @@ -848,7 +848,7 @@ async def put_root_list_single_item(self, bananas: List[_models.Banana], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -882,7 +882,7 @@ async def put_root_list_single_item(self, bananas: List[_models.Banana], **kwarg return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: + async def get_empty_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets an empty list as the root element. :return: list of Banana or the result of cls(response) @@ -895,12 +895,12 @@ async def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_get_empty_root_list_request( headers=_headers, @@ -927,7 +927,7 @@ async def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: return deserialized # type: ignore @distributed_trace_async - async def put_empty_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> None: + async def put_empty_root_list(self, bananas: list[_models.Banana], **kwargs: Any) -> None: """Puts an empty list as the root element. :param bananas: Required. @@ -942,7 +942,7 @@ async def put_empty_root_list(self, bananas: List[_models.Banana], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -989,7 +989,7 @@ async def get_empty_child_element(self, **kwargs: Any) -> _models.Banana: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1036,7 +1036,7 @@ async def put_empty_child_element(self, banana: _models.Banana, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1082,7 +1082,7 @@ async def list_containers(self, **kwargs: Any) -> _models.ListContainersResponse 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1129,7 +1129,7 @@ async def get_service_properties(self, **kwargs: Any) -> _models.StorageServiceP 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1180,7 +1180,7 @@ async def put_service_properties(self, properties: _models.StorageServicePropert 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1217,7 +1217,7 @@ async def put_service_properties(self, properties: _models.StorageServicePropert return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: + async def get_acls(self, **kwargs: Any) -> list[_models.SignedIdentifier]: """Gets storage ACLs for a container. :return: list of SignedIdentifier or the result of cls(response) @@ -1230,14 +1230,14 @@ async def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl")) restype: Literal["container"] = kwargs.pop("restype", _params.pop("restype", "container")) - cls: ClsType[List[_models.SignedIdentifier]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.SignedIdentifier]] = kwargs.pop("cls", None) _request = build_get_acls_request( comp=comp, @@ -1266,7 +1266,7 @@ async def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: return deserialized # type: ignore @distributed_trace_async - async def put_acls(self, properties: List[_models.SignedIdentifier], **kwargs: Any) -> None: + async def put_acls(self, properties: list[_models.SignedIdentifier], **kwargs: Any) -> None: """Puts storage ACLs for a container. :param properties: Required. @@ -1281,7 +1281,7 @@ async def put_acls(self, properties: List[_models.SignedIdentifier], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1334,7 +1334,7 @@ async def list_blobs(self, **kwargs: Any) -> _models.ListBlobsResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1386,7 +1386,7 @@ async def json_input(self, id: Optional[int] = None, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1433,7 +1433,7 @@ async def json_output(self, **kwargs: Any) -> _models.JSONOutput: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1479,7 +1479,7 @@ async def get_xms_text(self, **kwargs: Any) -> _models.ObjectWithXMsTextProperty 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1524,7 +1524,7 @@ async def get_bytes(self, **kwargs: Any) -> _models.ModelWithByteProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1572,7 +1572,7 @@ async def put_binary(self, bytes: Optional[bytes] = None, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1620,7 +1620,7 @@ async def get_uri(self, **kwargs: Any) -> _models.ModelWithUrlProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1668,7 +1668,7 @@ async def put_uri(self, url: Optional[str] = None, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py index fd349d03a40..68fd54b1dad 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/models/_models_py3.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- import datetime -from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -71,7 +71,7 @@ class AppleBarrel(_serialization.Model): } def __init__( - self, *, good_apples: Optional[List[str]] = None, bad_apples: Optional[List[str]] = None, **kwargs: Any + self, *, good_apples: Optional[list[str]] = None, bad_apples: Optional[list[str]] = None, **kwargs: Any ) -> None: """ :keyword good_apples: @@ -164,7 +164,7 @@ def __init__( deleted: bool, snapshot: str, properties: "_models.BlobProperties", - metadata: Optional[Dict[str, str]] = None, + metadata: Optional[dict[str, str]] = None, **kwargs: Any ) -> None: """ @@ -457,8 +457,8 @@ class Blobs(_serialization.Model): def __init__( self, *, - blob_prefix: Optional[List["_models.BlobPrefix"]] = None, - blob: Optional[List["_models.Blob"]] = None, + blob_prefix: Optional[list["_models.BlobPrefix"]] = None, + blob: Optional[list["_models.Blob"]] = None, **kwargs: Any ) -> None: """ @@ -542,7 +542,7 @@ def __init__( *, name: str, properties: "_models.ContainerProperties", - metadata: Optional[Dict[str, str]] = None, + metadata: Optional[dict[str, str]] = None, **kwargs: Any ) -> None: """ @@ -908,7 +908,7 @@ def __init__( max_results: int, next_marker: str, marker: Optional[str] = None, - containers: Optional[List["_models.Container"]] = None, + containers: Optional[list["_models.Container"]] = None, **kwargs: Any ) -> None: """ @@ -1278,7 +1278,7 @@ def __init__( *, type: Optional[str] = None, title: Optional[str] = None, - items: Optional[List[str]] = None, + items: Optional[list[str]] = None, **kwargs: Any ) -> None: """ @@ -1322,7 +1322,7 @@ def __init__( title: Optional[str] = None, date: Optional[str] = None, author: Optional[str] = None, - slides: Optional[List["_models.Slide"]] = None, + slides: Optional[list["_models.Slide"]] = None, **kwargs: Any ) -> None: """ @@ -1378,7 +1378,7 @@ def __init__( logging: Optional["_models.Logging"] = None, hour_metrics: Optional["_models.Metrics"] = None, minute_metrics: Optional["_models.Metrics"] = None, - cors: Optional[List["_models.CorsRule"]] = None, + cors: Optional[list["_models.CorsRule"]] = None, default_service_version: Optional[str] = None, delete_retention_policy: Optional["_models.RetentionPolicy"] = None, **kwargs: Any diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py index 0be0eaaedb4..d539999b53c 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/Xml/xmlservice/operations/_xml_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -594,7 +594,7 @@ def get_complex_type_ref_no_meta(self, **kwargs: Any) -> _models.RootWithRefAndN 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -643,7 +643,7 @@ def put_complex_type_ref_no_meta( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -689,7 +689,7 @@ def get_complex_type_ref_with_meta(self, **kwargs: Any) -> _models.RootWithRefAn 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -738,7 +738,7 @@ def put_complex_type_ref_with_meta( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -784,7 +784,7 @@ def get_simple(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -834,7 +834,7 @@ def put_simple( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -881,7 +881,7 @@ def get_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -930,7 +930,7 @@ def put_wrapped_lists( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -977,7 +977,7 @@ def get_headers(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1021,7 +1021,7 @@ def get_empty_list(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1070,7 +1070,7 @@ def put_empty_list( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1116,7 +1116,7 @@ def get_empty_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1165,7 +1165,7 @@ def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1198,7 +1198,7 @@ def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: + def get_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list as the root element. :return: list of Banana or the result of cls(response) @@ -1211,12 +1211,12 @@ def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_get_root_list_request( headers=_headers, @@ -1244,7 +1244,7 @@ def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: @distributed_trace def put_root_list( # pylint: disable=inconsistent-return-statements - self, bananas: List[_models.Banana], **kwargs: Any + self, bananas: list[_models.Banana], **kwargs: Any ) -> None: """Puts a list as the root element. @@ -1260,7 +1260,7 @@ def put_root_list( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1294,7 +1294,7 @@ def put_root_list( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: + def get_root_list_single_item(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list with a single item. :return: list of Banana or the result of cls(response) @@ -1307,12 +1307,12 @@ def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_get_root_list_single_item_request( headers=_headers, @@ -1340,7 +1340,7 @@ def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: @distributed_trace def put_root_list_single_item( # pylint: disable=inconsistent-return-statements - self, bananas: List[_models.Banana], **kwargs: Any + self, bananas: list[_models.Banana], **kwargs: Any ) -> None: """Puts a list with a single item. @@ -1356,7 +1356,7 @@ def put_root_list_single_item( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1390,7 +1390,7 @@ def put_root_list_single_item( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: + def get_empty_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets an empty list as the root element. :return: list of Banana or the result of cls(response) @@ -1403,12 +1403,12 @@ def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_get_empty_root_list_request( headers=_headers, @@ -1436,7 +1436,7 @@ def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: @distributed_trace def put_empty_root_list( # pylint: disable=inconsistent-return-statements - self, bananas: List[_models.Banana], **kwargs: Any + self, bananas: list[_models.Banana], **kwargs: Any ) -> None: """Puts an empty list as the root element. @@ -1452,7 +1452,7 @@ def put_empty_root_list( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1499,7 +1499,7 @@ def get_empty_child_element(self, **kwargs: Any) -> _models.Banana: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1548,7 +1548,7 @@ def put_empty_child_element( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1594,7 +1594,7 @@ def list_containers(self, **kwargs: Any) -> _models.ListContainersResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1641,7 +1641,7 @@ def get_service_properties(self, **kwargs: Any) -> _models.StorageServicePropert 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1694,7 +1694,7 @@ def put_service_properties( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1731,7 +1731,7 @@ def put_service_properties( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: + def get_acls(self, **kwargs: Any) -> list[_models.SignedIdentifier]: """Gets storage ACLs for a container. :return: list of SignedIdentifier or the result of cls(response) @@ -1744,14 +1744,14 @@ def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl")) restype: Literal["container"] = kwargs.pop("restype", _params.pop("restype", "container")) - cls: ClsType[List[_models.SignedIdentifier]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.SignedIdentifier]] = kwargs.pop("cls", None) _request = build_get_acls_request( comp=comp, @@ -1781,7 +1781,7 @@ def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: @distributed_trace def put_acls( # pylint: disable=inconsistent-return-statements - self, properties: List[_models.SignedIdentifier], **kwargs: Any + self, properties: list[_models.SignedIdentifier], **kwargs: Any ) -> None: """Puts storage ACLs for a container. @@ -1797,7 +1797,7 @@ def put_acls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1850,7 +1850,7 @@ def list_blobs(self, **kwargs: Any) -> _models.ListBlobsResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1904,7 +1904,7 @@ def json_input( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1951,7 +1951,7 @@ def json_output(self, **kwargs: Any) -> _models.JSONOutput: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1997,7 +1997,7 @@ def get_xms_text(self, **kwargs: Any) -> _models.ObjectWithXMsTextProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2042,7 +2042,7 @@ def get_bytes(self, **kwargs: Any) -> _models.ModelWithByteProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2092,7 +2092,7 @@ def put_binary( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2140,7 +2140,7 @@ def get_uri(self, **kwargs: Any) -> _models.ModelWithUrlProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2190,7 +2190,7 @@ def put_uri( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_utils/serialization.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py index ccfb3b41066..28aaabbcaa6 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/aio/operations/_pet_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._configuration import XMSErrorResponseExtensionsConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PetOperations: @@ -70,7 +70,7 @@ async def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional[_models.Pe 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -124,7 +124,7 @@ async def do_something(self, what_action: str, **kwargs: Any) -> _models.PetActi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -179,7 +179,7 @@ async def has_models_param(self, models: str = "value1", **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py index 2ebbbacfb87..1296f73ce8d 100644 --- a/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py +++ b/packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/XmsErrorResponse/xmserrorresponse/operations/_pet_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -126,7 +126,7 @@ def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional[_models.Pet]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -180,7 +180,7 @@ def do_something(self, what_action: str, **kwargs: Any) -> _models.PetAction: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -237,7 +237,7 @@ def has_models_param( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/aio/operations/_operations.py index ebc2dd1ca94..fc208fe3b88 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PetsOperations: @@ -150,7 +150,7 @@ async def create_ap_true(self, create_parameters: Union[JSON, IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -293,7 +293,7 @@ async def create_cat_ap_true(self, create_parameters: Union[JSON, IO[bytes]], ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -431,7 +431,7 @@ async def create_ap_object(self, create_parameters: Union[JSON, IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -569,7 +569,7 @@ async def create_ap_string(self, create_parameters: Union[JSON, IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -707,7 +707,7 @@ async def create_ap_in_properties(self, create_parameters: Union[JSON, IO[bytes] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -867,7 +867,7 @@ async def create_ap_in_properties_with_ap_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/operations/_operations.py index d794f1ccbeb..f26bd5bb064 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AdditionalPropertiesVersionTolerant/additionalpropertiesversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -248,7 +248,7 @@ def create_ap_true(self, create_parameters: Union[JSON, IO[bytes]], **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -391,7 +391,7 @@ def create_cat_ap_true(self, create_parameters: Union[JSON, IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -529,7 +529,7 @@ def create_ap_object(self, create_parameters: Union[JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -667,7 +667,7 @@ def create_ap_string(self, create_parameters: Union[JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -805,7 +805,7 @@ def create_ap_in_properties(self, create_parameters: Union[JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -963,7 +963,7 @@ def create_ap_in_properties_with_ap_string(self, create_parameters: Union[JSON, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_operations/_operations.py index 24311a83df6..1180d9dd7fd 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -136,7 +136,7 @@ def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -187,7 +187,7 @@ def put_object(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -284,7 +284,7 @@ def put_string(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -381,7 +381,7 @@ def put_array(self, input: Any, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_operations/_operations.py index 008e2b69625..a8fa7d5bad0 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/AnythingVersionTolerant/anythingversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AnythingClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AnythingClientOperationsMixin( @@ -57,7 +57,7 @@ async def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -108,7 +108,7 @@ async def put_object(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -154,7 +154,7 @@ async def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -205,7 +205,7 @@ async def put_string(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -251,7 +251,7 @@ async def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -302,7 +302,7 @@ async def put_array(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/aio/operations/_operations.py index a93f9f5bb4a..39367855709 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/aio/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -101,7 +101,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ArrayOperations: # pylint: disable=too-many-public-methods @@ -124,7 +124,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> List[int]: + async def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int @@ -145,12 +145,12 @@ async def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_null_request( headers=_headers, @@ -175,12 +175,12 @@ async def get_null(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> List[int]: + async def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int @@ -201,12 +201,12 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_invalid_request( headers=_headers, @@ -231,12 +231,12 @@ async def get_invalid(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> List[int]: + async def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int @@ -257,12 +257,12 @@ async def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_empty_request( headers=_headers, @@ -287,12 +287,12 @@ async def get_empty(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @overload - async def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -328,7 +328,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value empty []. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -343,7 +343,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -383,7 +383,7 @@ async def put_empty(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool @@ -404,12 +404,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_tfft_request( headers=_headers, @@ -434,13 +434,13 @@ async def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bool], deserialized), {}) # type: ignore - return cast(List[bool], deserialized) # type: ignore + return cast(list[bool], deserialized) # type: ignore @overload async def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -479,7 +479,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [true, false, false, true]. :param array_body: Is either a [bool] type or a IO[bytes] type. Required. @@ -494,7 +494,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -534,7 +534,7 @@ async def put_boolean_tfft(self, array_body: Union[List[bool], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool @@ -555,12 +555,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_null_request( headers=_headers, @@ -585,12 +585,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bool], deserialized), {}) # type: ignore - return cast(List[bool], deserialized) # type: ignore + return cast(list[bool], deserialized) # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool @@ -611,12 +611,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_string_request( headers=_headers, @@ -641,12 +641,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bool], deserialized), {}) # type: ignore - return cast(List[bool], deserialized) # type: ignore + return cast(list[bool], deserialized) # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> List[int]: + async def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -667,12 +667,12 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_integer_valid_request( headers=_headers, @@ -697,13 +697,13 @@ async def get_integer_valid(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @overload async def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -742,7 +742,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -757,7 +757,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -797,7 +797,7 @@ async def put_integer_valid(self, array_body: Union[List[int], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int @@ -818,12 +818,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_null_request( headers=_headers, @@ -848,12 +848,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int @@ -874,12 +874,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_string_request( headers=_headers, @@ -904,12 +904,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> List[int]: + async def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -930,12 +930,12 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_valid_request( headers=_headers, @@ -960,13 +960,13 @@ async def get_long_valid(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @overload async def put_long_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1005,7 +1005,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Is either a [int] type or a IO[bytes] type. Required. @@ -1020,7 +1020,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1060,7 +1060,7 @@ async def put_long_valid(self, array_body: Union[List[int], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int @@ -1081,12 +1081,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_null_request( headers=_headers, @@ -1111,12 +1111,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + async def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int @@ -1137,12 +1137,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_string_request( headers=_headers, @@ -1167,12 +1167,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> List[float]: + async def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -1193,12 +1193,12 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_valid_request( headers=_headers, @@ -1223,13 +1223,13 @@ async def get_float_valid(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @overload async def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1268,7 +1268,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1283,7 +1283,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1323,7 +1323,7 @@ async def put_float_valid(self, array_body: Union[List[float], IO[bytes]], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -1344,12 +1344,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_null_request( headers=_headers, @@ -1374,12 +1374,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -1400,12 +1400,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_string_request( headers=_headers, @@ -1430,12 +1430,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> List[float]: + async def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -1456,12 +1456,12 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_valid_request( headers=_headers, @@ -1486,13 +1486,13 @@ async def get_double_valid(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @overload async def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -1531,7 +1531,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """Set array value [0, -0.01, 1.2e20]. :param array_body: Is either a [float] type or a IO[bytes] type. Required. @@ -1546,7 +1546,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1586,7 +1586,7 @@ async def put_double_valid(self, array_body: Union[List[float], IO[bytes]], **kw return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -1607,12 +1607,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_null_request( headers=_headers, @@ -1637,12 +1637,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + async def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -1663,12 +1663,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_string_request( headers=_headers, @@ -1693,12 +1693,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> List[str]: + async def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -1719,12 +1719,12 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_valid_request( headers=_headers, @@ -1749,13 +1749,13 @@ async def get_string_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload async def put_string_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1794,7 +1794,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -1809,7 +1809,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1849,7 +1849,7 @@ async def put_string_valid(self, array_body: Union[List[str], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_enum_valid(self, **kwargs: Any) -> List[str]: + async def get_enum_valid(self, **kwargs: Any) -> list[str]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -1870,12 +1870,12 @@ async def get_enum_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_enum_valid_request( headers=_headers, @@ -1900,13 +1900,13 @@ async def get_enum_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload async def put_enum_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -1945,7 +1945,7 @@ async def put_enum_valid( """ @distributed_trace_async - async def put_enum_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_enum_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -1960,7 +1960,7 @@ async def put_enum_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2000,7 +2000,7 @@ async def put_enum_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_enum_valid(self, **kwargs: Any) -> List[str]: + async def get_string_enum_valid(self, **kwargs: Any) -> list[str]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -2021,12 +2021,12 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_enum_valid_request( headers=_headers, @@ -2051,13 +2051,13 @@ async def get_string_enum_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload async def put_string_enum_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2096,7 +2096,7 @@ async def put_string_enum_valid( """ @distributed_trace_async - async def put_string_enum_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_enum_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Is either a [str] type or a IO[bytes] type. Required. @@ -2111,7 +2111,7 @@ async def put_string_enum_valid(self, array_body: Union[List[str], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2151,7 +2151,7 @@ async def put_string_enum_valid(self, array_body: Union[List[str], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> List[str]: + async def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str @@ -2172,12 +2172,12 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_null_request( headers=_headers, @@ -2202,12 +2202,12 @@ async def get_string_with_null(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + async def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str @@ -2228,12 +2228,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_invalid_request( headers=_headers, @@ -2258,12 +2258,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @distributed_trace_async - async def get_uuid_valid(self, **kwargs: Any) -> List[str]: + async def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2285,12 +2285,12 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_valid_request( headers=_headers, @@ -2315,13 +2315,13 @@ async def get_uuid_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload async def put_uuid_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2362,7 +2362,7 @@ async def put_uuid_valid( """ @distributed_trace_async - async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put_uuid_valid(self, array_body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -2378,7 +2378,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2418,7 +2418,7 @@ async def put_uuid_valid(self, array_body: Union[List[str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + async def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str @@ -2439,12 +2439,12 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_invalid_chars_request( headers=_headers, @@ -2469,12 +2469,12 @@ async def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date @@ -2495,12 +2495,12 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_valid_request( headers=_headers, @@ -2525,13 +2525,13 @@ async def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.date], deserialized), {}) # type: ignore - return cast(List[datetime.date], deserialized) # type: ignore + return cast(list[datetime.date], deserialized) # type: ignore @overload async def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -2570,7 +2570,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. :param array_body: Is either a [datetime.date] type or a IO[bytes] type. Required. @@ -2585,7 +2585,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2625,7 +2625,7 @@ async def put_date_valid(self, array_body: Union[List[datetime.date], IO[bytes]] return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date @@ -2646,12 +2646,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_null_request( headers=_headers, @@ -2676,12 +2676,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.date], deserialized), {}) # type: ignore - return cast(List[datetime.date], deserialized) # type: ignore + return cast(list[datetime.date], deserialized) # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date @@ -2702,12 +2702,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_chars_request( headers=_headers, @@ -2732,12 +2732,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.date], deserialized), {}) # type: ignore - return cast(List[datetime.date], deserialized) # type: ignore + return cast(list[datetime.date], deserialized) # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2759,12 +2759,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_valid_request( headers=_headers, @@ -2789,13 +2789,13 @@ async def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @overload async def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2836,7 +2836,7 @@ async def put_date_time_valid( """ @distributed_trace_async - async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put_date_time_valid(self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -2852,7 +2852,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2892,7 +2892,7 @@ async def put_date_time_valid(self, array_body: Union[List[datetime.datetime], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime @@ -2913,12 +2913,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_null_request( headers=_headers, @@ -2943,12 +2943,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datet deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime @@ -2969,12 +2969,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_chars_request( headers=_headers, @@ -2999,12 +2999,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.date deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3026,12 +3026,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3056,13 +3056,13 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.date deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @overload async def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3104,7 +3104,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3121,7 +3121,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3161,7 +3161,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta @@ -3182,12 +3182,12 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_array_get_duration_valid_request( headers=_headers, @@ -3212,13 +3212,13 @@ async def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.timedelta], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.timedelta], deserialized), {}) # type: ignore - return cast(List[datetime.timedelta], deserialized) # type: ignore + return cast(list[datetime.timedelta], deserialized) # type: ignore @overload async def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -3257,7 +3257,7 @@ async def put_duration_valid( """ @distributed_trace_async - async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put_duration_valid(self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :param array_body: Is either a [datetime.timedelta] type or a IO[bytes] type. Required. @@ -3272,7 +3272,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3312,7 +3312,7 @@ async def put_duration_valid(self, array_body: Union[List[datetime.timedelta], I return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + async def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -3334,12 +3334,12 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_valid_request( headers=_headers, @@ -3364,13 +3364,13 @@ async def get_byte_valid(self, **kwargs: Any) -> List[bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bytes], deserialized), {}) # type: ignore - return cast(List[bytes], deserialized) # type: ignore + return cast(list[bytes], deserialized) # type: ignore @overload async def put_byte_valid( - self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3411,7 +3411,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -3427,7 +3427,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3467,7 +3467,7 @@ async def put_byte_valid(self, array_body: Union[List[bytes], IO[bytes]], **kwar return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes @@ -3488,12 +3488,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_invalid_null_request( headers=_headers, @@ -3518,12 +3518,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bytes], deserialized), {}) # type: ignore - return cast(List[bytes], deserialized) # type: ignore + return cast(list[bytes], deserialized) # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> List[bytes]: + async def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -3545,12 +3545,12 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_base64_url_request( headers=_headers, @@ -3575,12 +3575,12 @@ async def get_base64_url(self, **kwargs: Any) -> List[bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bytes], deserialized), {}) # type: ignore - return cast(List[bytes], deserialized) # type: ignore + return cast(list[bytes], deserialized) # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> List[JSON]: + async def get_complex_null(self, **kwargs: Any) -> list[JSON]: """Get array of complex type null value. :return: list of JSON object @@ -3604,12 +3604,12 @@ async def get_complex_null(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_null_request( headers=_headers, @@ -3634,12 +3634,12 @@ async def get_complex_null(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> List[JSON]: + async def get_complex_empty(self, **kwargs: Any) -> list[JSON]: """Get empty array of complex type []. :return: list of JSON object @@ -3663,12 +3663,12 @@ async def get_complex_empty(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_empty_request( headers=_headers, @@ -3693,12 +3693,12 @@ async def get_complex_empty(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> List[JSON]: + async def get_complex_item_null(self, **kwargs: Any) -> list[JSON]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -3723,12 +3723,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_null_request( headers=_headers, @@ -3753,12 +3753,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> List[JSON]: + async def get_complex_item_empty(self, **kwargs: Any) -> list[JSON]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -3783,12 +3783,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_empty_request( headers=_headers, @@ -3813,12 +3813,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> List[JSON]: + async def get_complex_valid(self, **kwargs: Any) -> list[JSON]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3843,12 +3843,12 @@ async def get_complex_valid(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_valid_request( headers=_headers, @@ -3873,13 +3873,13 @@ async def get_complex_valid(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @overload async def put_complex_valid( - self, array_body: List[JSON], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[JSON], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3923,7 +3923,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[List[JSON], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[list[JSON], IO[bytes]], **kwargs: Any) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -3939,7 +3939,7 @@ async def put_complex_valid(self, array_body: Union[List[JSON], IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3979,7 +3979,7 @@ async def put_complex_valid(self, array_body: Union[List[JSON], IO[bytes]], **kw return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str @@ -4002,12 +4002,12 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_null_request( headers=_headers, @@ -4032,12 +4032,12 @@ async def get_array_null(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str @@ -4060,12 +4060,12 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_empty_request( headers=_headers, @@ -4090,12 +4090,12 @@ async def get_array_empty(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str @@ -4118,12 +4118,12 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_null_request( headers=_headers, @@ -4148,12 +4148,12 @@ async def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str @@ -4176,12 +4176,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_empty_request( headers=_headers, @@ -4206,12 +4206,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + async def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str @@ -4234,12 +4234,12 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_valid_request( headers=_headers, @@ -4264,13 +4264,13 @@ async def get_array_valid(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @overload async def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -4311,7 +4311,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :param array_body: Is either a [[str]] type or a IO[bytes] type. Required. @@ -4326,7 +4326,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4366,7 +4366,7 @@ async def put_array_valid(self, array_body: Union[List[List[str]], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str @@ -4389,12 +4389,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_null_request( headers=_headers, @@ -4419,12 +4419,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str @@ -4447,12 +4447,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_empty_request( headers=_headers, @@ -4477,12 +4477,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4506,12 +4506,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_null_request( headers=_headers, @@ -4536,12 +4536,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4565,12 +4565,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_empty_request( headers=_headers, @@ -4595,12 +4595,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]] deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4624,12 +4624,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_valid_request( headers=_headers, @@ -4654,13 +4654,13 @@ async def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @overload async def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4703,7 +4703,7 @@ async def put_dictionary_valid( """ @distributed_trace_async - async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any) -> None: + async def put_dictionary_valid(self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -4719,7 +4719,7 @@ async def put_dictionary_valid(self, array_body: Union[List[Dict[str, str]], IO[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/operations/_operations.py index 8f2a58c9bef..55c97aaeb8e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyArrayVersionTolerant/bodyarrayversiontolerant/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1076,7 +1076,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> List[int]: + def get_null(self, **kwargs: Any) -> list[int]: """Get null array value. :return: list of int @@ -1097,12 +1097,12 @@ def get_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_null_request( headers=_headers, @@ -1127,12 +1127,12 @@ def get_null(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> List[int]: + def get_invalid(self, **kwargs: Any) -> list[int]: """Get invalid array [1, 2, 3. :return: list of int @@ -1153,12 +1153,12 @@ def get_invalid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_invalid_request( headers=_headers, @@ -1183,12 +1183,12 @@ def get_invalid(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> List[int]: + def get_empty(self, **kwargs: Any) -> list[int]: """Get empty array value []. :return: list of int @@ -1209,12 +1209,12 @@ def get_empty(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_empty_request( headers=_headers, @@ -1239,12 +1239,12 @@ def get_empty(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @overload - def put_empty(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty []. :param array_body: Required. @@ -1281,7 +1281,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty []. @@ -1297,7 +1297,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1337,7 +1337,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: + def get_boolean_tfft(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, false, false, true]. :return: list of bool @@ -1358,12 +1358,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_tfft_request( headers=_headers, @@ -1388,13 +1388,13 @@ def get_boolean_tfft(self, **kwargs: Any) -> List[bool]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bool], deserialized), {}) # type: ignore - return cast(List[bool], deserialized) # type: ignore + return cast(list[bool], deserialized) # type: ignore @overload def put_boolean_tfft( - self, array_body: List[bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1432,7 +1432,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bool], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [true, false, false, true]. @@ -1448,7 +1448,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1488,7 +1488,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, null, false]. :return: list of bool @@ -1509,12 +1509,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_null_request( headers=_headers, @@ -1539,12 +1539,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> List[bool]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bool], deserialized), {}) # type: ignore - return cast(List[bool], deserialized) # type: ignore + return cast(list[bool], deserialized) # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> list[bool]: """Get boolean array value [true, 'boolean', false]. :return: list of bool @@ -1565,12 +1565,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_array_get_boolean_invalid_string_request( headers=_headers, @@ -1595,12 +1595,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> List[bool]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bool], deserialized), {}) # type: ignore - return cast(List[bool], deserialized) # type: ignore + return cast(list[bool], deserialized) # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> List[int]: + def get_integer_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -1621,12 +1621,12 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_integer_valid_request( headers=_headers, @@ -1651,13 +1651,13 @@ def get_integer_valid(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @overload def put_integer_valid( - self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1697,7 +1697,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1713,7 +1713,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1753,7 +1753,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> List[int]: + def get_int_invalid_null(self, **kwargs: Any) -> list[int]: """Get integer array value [1, null, 0]. :return: list of int @@ -1774,12 +1774,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_null_request( headers=_headers, @@ -1804,12 +1804,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> List[int]: + def get_int_invalid_string(self, **kwargs: Any) -> list[int]: """Get integer array value [1, 'integer', 0]. :return: list of int @@ -1830,12 +1830,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_int_invalid_string_request( headers=_headers, @@ -1860,12 +1860,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> List[int]: + def get_long_valid(self, **kwargs: Any) -> list[int]: """Get integer array value [1, -1, 3, 300]. :return: list of int @@ -1886,12 +1886,12 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_valid_request( headers=_headers, @@ -1916,12 +1916,12 @@ def get_long_valid(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @overload - def put_long_valid(self, array_body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_long_valid(self, array_body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value empty [1, -1, 3, 300]. :param array_body: Required. @@ -1958,7 +1958,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[int], IO[bytes]], **kwargs: Any + self, array_body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """Set array value empty [1, -1, 3, 300]. @@ -1974,7 +1974,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2014,7 +2014,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> List[int]: + def get_long_invalid_null(self, **kwargs: Any) -> list[int]: """Get long array value [1, null, 0]. :return: list of int @@ -2035,12 +2035,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_null_request( headers=_headers, @@ -2065,12 +2065,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> List[int]: + def get_long_invalid_string(self, **kwargs: Any) -> list[int]: """Get long array value [1, 'integer', 0]. :return: list of int @@ -2091,12 +2091,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_array_get_long_invalid_string_request( headers=_headers, @@ -2121,12 +2121,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> List[int]: deserialized = None if cls: - return cls(pipeline_response, cast(List[int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[int], deserialized), {}) # type: ignore - return cast(List[int], deserialized) # type: ignore + return cast(list[int], deserialized) # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> List[float]: + def get_float_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -2147,12 +2147,12 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_valid_request( headers=_headers, @@ -2177,13 +2177,13 @@ def get_float_valid(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @overload def put_float_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2221,7 +2221,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2237,7 +2237,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2277,7 +2277,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> List[float]: + def get_float_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -2298,12 +2298,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_null_request( headers=_headers, @@ -2328,12 +2328,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> List[float]: + def get_float_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -2354,12 +2354,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_float_invalid_string_request( headers=_headers, @@ -2384,12 +2384,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> List[float]: + def get_double_valid(self, **kwargs: Any) -> list[float]: """Get float array value [0, -0.01, 1.2e20]. :return: list of float @@ -2410,12 +2410,12 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_valid_request( headers=_headers, @@ -2440,13 +2440,13 @@ def get_double_valid(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @overload def put_double_valid( - self, array_body: List[float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2484,7 +2484,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[float], IO[bytes]], **kwargs: Any + self, array_body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """Set array value [0, -0.01, 1.2e20]. @@ -2500,7 +2500,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2540,7 +2540,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> List[float]: + def get_double_invalid_null(self, **kwargs: Any) -> list[float]: """Get float array value [0.0, null, -1.2e20]. :return: list of float @@ -2561,12 +2561,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_null_request( headers=_headers, @@ -2591,12 +2591,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> List[float]: + def get_double_invalid_string(self, **kwargs: Any) -> list[float]: """Get boolean array value [1.0, 'number', 0.0]. :return: list of float @@ -2617,12 +2617,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_array_get_double_invalid_string_request( headers=_headers, @@ -2647,12 +2647,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> List[float]: deserialized = None if cls: - return cls(pipeline_response, cast(List[float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[float], deserialized), {}) # type: ignore - return cast(List[float], deserialized) # type: ignore + return cast(list[float], deserialized) # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> List[str]: + def get_string_valid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -2673,12 +2673,12 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_valid_request( headers=_headers, @@ -2703,12 +2703,12 @@ def get_string_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload - def put_string_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_string_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Required. @@ -2745,7 +2745,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2761,7 +2761,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2801,7 +2801,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_enum_valid(self, **kwargs: Any) -> List[str]: + def get_enum_valid(self, **kwargs: Any) -> list[str]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -2822,12 +2822,12 @@ def get_enum_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_enum_valid_request( headers=_headers, @@ -2852,12 +2852,12 @@ def get_enum_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload - def put_enum_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_enum_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['foo1', 'foo2', 'foo3']. :param array_body: Required. @@ -2894,7 +2894,7 @@ def put_enum_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -2910,7 +2910,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2950,7 +2950,7 @@ def put_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_enum_valid(self, **kwargs: Any) -> List[str]: + def get_string_enum_valid(self, **kwargs: Any) -> list[str]: """Get enum array value ['foo1', 'foo2', 'foo3']. :return: list of str @@ -2971,12 +2971,12 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_enum_valid_request( headers=_headers, @@ -3001,13 +3001,13 @@ def get_string_enum_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload def put_string_enum_valid( - self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -3047,7 +3047,7 @@ def put_string_enum_valid( @distributed_trace def put_string_enum_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['foo1', 'foo2', 'foo3']. @@ -3063,7 +3063,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3103,7 +3103,7 @@ def put_string_enum_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> List[str]: + def get_string_with_null(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', null, 'foo2']. :return: list of str @@ -3124,12 +3124,12 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_null_request( headers=_headers, @@ -3154,12 +3154,12 @@ def get_string_with_null(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> List[str]: + def get_string_with_invalid(self, **kwargs: Any) -> list[str]: """Get string array value ['foo', 123, 'foo2']. :return: list of str @@ -3180,12 +3180,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_string_with_invalid_request( headers=_headers, @@ -3210,12 +3210,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @distributed_trace - def get_uuid_valid(self, **kwargs: Any) -> List[str]: + def get_uuid_valid(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3237,12 +3237,12 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_valid_request( headers=_headers, @@ -3267,12 +3267,12 @@ def get_uuid_valid(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @overload - def put_uuid_valid(self, array_body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_uuid_valid(self, array_body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3311,7 +3311,7 @@ def put_uuid_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_uuid_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[str], IO[bytes]], **kwargs: Any + self, array_body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'd1399005-30f7-40d6-8da6-dd7c89ad34db', 'f42f6aa1-a5bc-4ddf-907e-5f915de43205']. @@ -3328,7 +3328,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3368,7 +3368,7 @@ def put_uuid_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: + def get_uuid_invalid_chars(self, **kwargs: Any) -> list[str]: """Get uuid array value ['6dcc7237-45fe-45c4-8a6b-3a8a3f625652', 'foo']. :return: list of str @@ -3389,12 +3389,12 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_array_get_uuid_invalid_chars_request( headers=_headers, @@ -3419,12 +3419,12 @@ def get_uuid_invalid_chars(self, **kwargs: Any) -> List[str]: deserialized = None if cls: - return cls(pipeline_response, cast(List[str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[str], deserialized), {}) # type: ignore - return cast(List[str], deserialized) # type: ignore + return cast(list[str], deserialized) # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: + def get_date_valid(self, **kwargs: Any) -> list[datetime.date]: """Get integer array value ['2000-12-01', '1980-01-02', '1492-10-12']. :return: list of date @@ -3445,12 +3445,12 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_valid_request( headers=_headers, @@ -3475,13 +3475,13 @@ def get_date_valid(self, **kwargs: Any) -> List[datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.date], deserialized), {}) # type: ignore - return cast(List[datetime.date], deserialized) # type: ignore + return cast(list[datetime.date], deserialized) # type: ignore @overload def put_date_valid( - self, array_body: List[datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3519,7 +3519,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01', '1980-01-02', '1492-10-12']. @@ -3535,7 +3535,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3575,7 +3575,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2012-01-01', null, '1776-07-04']. :return: list of date @@ -3596,12 +3596,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_null_request( headers=_headers, @@ -3626,12 +3626,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> List[datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.date], deserialized), {}) # type: ignore - return cast(List[datetime.date], deserialized) # type: ignore + return cast(list[datetime.date], deserialized) # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> list[datetime.date]: """Get date array value ['2011-03-22', 'date']. :return: list of date @@ -3652,12 +3652,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.date]] = kwargs.pop("cls", None) _request = build_array_get_date_invalid_chars_request( headers=_headers, @@ -3682,12 +3682,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> List[datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.date], deserialized), {}) # type: ignore - return cast(List[datetime.date], deserialized) # type: ignore + return cast(list[datetime.date], deserialized) # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3709,12 +3709,12 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_valid_request( headers=_headers, @@ -3739,13 +3739,13 @@ def get_date_time_valid(self, **kwargs: Any) -> List[datetime.datetime]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @overload def put_date_time_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3787,7 +3787,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['2000-12-01t00:00:01z', '1980-01-02T00:11:35+01:00', '1492-10-12T10:15:01-08:00']. @@ -3804,7 +3804,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3844,7 +3844,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', null]. :return: list of datetime @@ -3865,12 +3865,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_null_request( headers=_headers, @@ -3895,12 +3895,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> List[datetime.datetime]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> list[datetime.datetime]: """Get date array value ['2000-12-01t00:00:01z', 'date-time']. :return: list of datetime @@ -3921,12 +3921,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_invalid_chars_request( headers=_headers, @@ -3951,12 +3951,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> List[datetime.datetime]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> list[datetime.datetime]: """Get date-time array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -3978,12 +3978,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_array_get_date_time_rfc1123_valid_request( headers=_headers, @@ -4008,13 +4008,13 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> List[datetime.datetime]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.datetime], deserialized), {}) # type: ignore - return cast(List[datetime.datetime], deserialized) # type: ignore + return cast(list[datetime.datetime], deserialized) # type: ignore @overload def put_date_time_rfc1123_valid( - self, array_body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -4056,7 +4056,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['Fri, 01 Dec 2000 00:00:01 GMT', 'Wed, 02 Jan 1980 00:11:35 GMT', 'Wed, 12 Oct 1492 10:15:01 GMT']. @@ -4073,7 +4073,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4113,7 +4113,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> list[datetime.timedelta]: """Get duration array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. :return: list of timedelta @@ -4134,12 +4134,12 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_array_get_duration_valid_request( headers=_headers, @@ -4164,13 +4164,13 @@ def get_duration_valid(self, **kwargs: Any) -> List[datetime.timedelta]: deserialized = None if cls: - return cls(pipeline_response, cast(List[datetime.timedelta], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[datetime.timedelta], deserialized), {}) # type: ignore - return cast(List[datetime.timedelta], deserialized) # type: ignore + return cast(list[datetime.timedelta], deserialized) # type: ignore @overload def put_duration_valid( - self, array_body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -4210,7 +4210,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set array value ['P123DT22H14M12.011S', 'P5DT1H0M0S']. @@ -4226,7 +4226,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4266,7 +4266,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> List[bytes]: + def get_byte_valid(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each item encoded in base64. @@ -4288,12 +4288,12 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_valid_request( headers=_headers, @@ -4318,12 +4318,12 @@ def get_byte_valid(self, **kwargs: Any) -> List[bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bytes], deserialized), {}) # type: ignore - return cast(List[bytes], deserialized) # type: ignore + return cast(list[bytes], deserialized) # type: ignore @overload - def put_byte_valid(self, array_body: List[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_byte_valid(self, array_body: list[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -4362,7 +4362,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[list[bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the array value [hex(FF FF FF FA), hex(01 02 03), hex (25, 29, 43)] with each elementencoded in base 64. @@ -4379,7 +4379,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4419,7 +4419,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> list[bytes]: """Get byte array value [hex(AB, AC, AD), null] with the first item base64 encoded. :return: list of bytes @@ -4440,12 +4440,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_byte_invalid_null_request( headers=_headers, @@ -4470,12 +4470,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> List[bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bytes], deserialized), {}) # type: ignore - return cast(List[bytes], deserialized) # type: ignore + return cast(list[bytes], deserialized) # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> List[bytes]: + def get_base64_url(self, **kwargs: Any) -> list[bytes]: """Get array value ['a string that gets encoded with base64url', 'test string' 'Lorem ipsum'] with the items base64url encoded. @@ -4497,12 +4497,12 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bytes]] = kwargs.pop("cls", None) + cls: ClsType[list[bytes]] = kwargs.pop("cls", None) _request = build_array_get_base64_url_request( headers=_headers, @@ -4527,12 +4527,12 @@ def get_base64_url(self, **kwargs: Any) -> List[bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(List[bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[bytes], deserialized), {}) # type: ignore - return cast(List[bytes], deserialized) # type: ignore + return cast(list[bytes], deserialized) # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> List[JSON]: + def get_complex_null(self, **kwargs: Any) -> list[JSON]: """Get array of complex type null value. :return: list of JSON object @@ -4556,12 +4556,12 @@ def get_complex_null(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_null_request( headers=_headers, @@ -4586,12 +4586,12 @@ def get_complex_null(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> List[JSON]: + def get_complex_empty(self, **kwargs: Any) -> list[JSON]: """Get empty array of complex type []. :return: list of JSON object @@ -4615,12 +4615,12 @@ def get_complex_empty(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_empty_request( headers=_headers, @@ -4645,12 +4645,12 @@ def get_complex_empty(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> List[JSON]: + def get_complex_item_null(self, **kwargs: Any) -> list[JSON]: """Get array of complex type with null item [{'integer': 1 'string': '2'}, null, {'integer': 5, 'string': '6'}]. @@ -4675,12 +4675,12 @@ def get_complex_item_null(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_null_request( headers=_headers, @@ -4705,12 +4705,12 @@ def get_complex_item_null(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> List[JSON]: + def get_complex_item_empty(self, **kwargs: Any) -> list[JSON]: """Get array of complex type with empty item [{'integer': 1 'string': '2'}, {}, {'integer': 5, 'string': '6'}]. @@ -4735,12 +4735,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_item_empty_request( headers=_headers, @@ -4765,12 +4765,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> List[JSON]: + def get_complex_valid(self, **kwargs: Any) -> list[JSON]: """Get array of complex type with [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4795,12 +4795,12 @@ def get_complex_valid(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_array_get_complex_valid_request( headers=_headers, @@ -4825,13 +4825,13 @@ def get_complex_valid(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @overload def put_complex_valid( - self, array_body: List[JSON], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[JSON], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4876,7 +4876,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[JSON], IO[bytes]], **kwargs: Any + self, array_body: Union[list[JSON], IO[bytes]], **kwargs: Any ) -> None: """Put an array of complex type with values [{'integer': 1 'string': '2'}, {'integer': 3, 'string': '4'}, {'integer': 5, 'string': '6'}]. @@ -4893,7 +4893,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4933,7 +4933,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_null(self, **kwargs: Any) -> list[list[str]]: """Get a null array. :return: list of list of str @@ -4956,12 +4956,12 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_null_request( headers=_headers, @@ -4986,12 +4986,12 @@ def get_array_null(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_empty(self, **kwargs: Any) -> list[list[str]]: """Get an empty array []. :return: list of list of str @@ -5014,12 +5014,12 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_empty_request( headers=_headers, @@ -5044,12 +5044,12 @@ def get_array_empty(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_null(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], null, ['7', '8', '9']]. :return: list of list of str @@ -5072,12 +5072,12 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_null_request( headers=_headers, @@ -5102,12 +5102,12 @@ def get_array_item_null(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], [], ['7', '8', '9']]. :return: list of list of str @@ -5130,12 +5130,12 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_item_empty_request( headers=_headers, @@ -5160,12 +5160,12 @@ def get_array_item_empty(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> List[List[str]]: + def get_array_valid(self, **kwargs: Any) -> list[list[str]]: """Get an array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. :return: list of list of str @@ -5188,12 +5188,12 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[list[list[str]]] = kwargs.pop("cls", None) _request = build_array_get_array_valid_request( headers=_headers, @@ -5218,13 +5218,13 @@ def get_array_valid(self, **kwargs: Any) -> List[List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[list[str]], deserialized), {}) # type: ignore - return cast(List[List[str]], deserialized) # type: ignore + return cast(list[list[str]], deserialized) # type: ignore @overload def put_array_valid( - self, array_body: List[List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -5264,7 +5264,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings [['1', '2', '3'], ['4', '5', '6'], ['7', '8', '9']]. @@ -5280,7 +5280,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5320,7 +5320,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries with value null. :return: list of dict mapping str to str @@ -5343,12 +5343,12 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_null_request( headers=_headers, @@ -5373,12 +5373,12 @@ def get_dictionary_null(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value []. :return: list of dict mapping str to str @@ -5401,12 +5401,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_empty_request( headers=_headers, @@ -5431,12 +5431,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, null, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5460,12 +5460,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_null_request( headers=_headers, @@ -5490,12 +5490,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5519,12 +5519,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_item_empty_request( headers=_headers, @@ -5549,12 +5549,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> list[dict[str, str]]: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5578,12 +5578,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[list[dict[str, str]]] = kwargs.pop("cls", None) _request = build_array_get_dictionary_valid_request( headers=_headers, @@ -5608,13 +5608,13 @@ def get_dictionary_valid(self, **kwargs: Any) -> List[Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(List[Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[dict[str, str]], deserialized), {}) # type: ignore - return cast(List[Dict[str, str]], deserialized) # type: ignore + return cast(list[dict[str, str]], deserialized) # type: ignore @overload def put_dictionary_valid( - self, array_body: List[Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: list[dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5658,7 +5658,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[List[Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[list[dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an array of Dictionaries of type with value [{'1': 'one', '2': 'two', '3': 'three'}, {'4': 'four', '5': 'five', '6': 'six'}, {'7': 'seven', '8': 'eight', '9': 'nine'}]. @@ -5675,7 +5675,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/aio/operations/_operations.py index 2dc76a01d1c..9b3f563b01e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, cast +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import BinaryWithContentTypeApplicationJsonConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class UploadOperations: @@ -71,7 +71,7 @@ async def file(self, file_param: IO[bytes], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def binary(self, file_param: IO[bytes], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ async def error_stream(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/operations/_operations.py index 2001d018fcb..542c98436bc 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBinaryVersionTolerant/bodybinaryversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, cast +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -111,7 +111,7 @@ def file(self, file_param: IO[bytes], **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -159,7 +159,7 @@ def binary(self, file_param: IO[bytes], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -225,7 +225,7 @@ def error_stream(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/aio/operations/_operations.py index 57d4a904253..f229a5fb910 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, cast +from typing import Any, Callable, Literal, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import AutoRestBoolTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class BoolOperations: @@ -68,7 +68,7 @@ async def get_true(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -116,7 +116,7 @@ async def put_true(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def get_false(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -211,7 +211,7 @@ async def put_false(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -258,7 +258,7 @@ async def get_null(self, **kwargs: Any) -> Optional[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -306,7 +306,7 @@ async def get_invalid(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/operations/_operations.py index 5292029a78a..a51a3c38df2 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyBooleanVersionTolerant/bodybooleanversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar, cast +from typing import Any, Callable, Literal, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -155,7 +155,7 @@ def get_true(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -203,7 +203,7 @@ def put_true(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -250,7 +250,7 @@ def get_false(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -298,7 +298,7 @@ def put_false(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -345,7 +345,7 @@ def get_null(self, **kwargs: Any) -> Optional[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -393,7 +393,7 @@ def get_invalid(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/aio/operations/_operations.py index 495f9700fab..bc60d8fcd43 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import AutoRestSwaggerBATByteServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ByteOperations: @@ -69,7 +69,7 @@ async def get_null(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -117,7 +117,7 @@ async def get_empty(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -165,7 +165,7 @@ async def get_non_ascii(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -216,7 +216,7 @@ async def put_non_ascii(self, byte_body: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -262,7 +262,7 @@ async def get_invalid(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/operations/_operations.py index 5c833b10589..bd77eaaae26 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyByteVersionTolerant/bodybyteversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -138,7 +138,7 @@ def get_null(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -186,7 +186,7 @@ def get_empty(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -234,7 +234,7 @@ def get_non_ascii(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -285,7 +285,7 @@ def put_non_ascii(self, byte_body: bytes, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -331,7 +331,7 @@ def get_invalid(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/aio/operations/_operations.py index 343ef32e96b..ab0eb2c2f87 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -86,7 +86,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class BasicOperations: @@ -132,7 +132,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -297,7 +297,7 @@ async def get_invalid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -355,7 +355,7 @@ async def get_empty(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -413,7 +413,7 @@ async def get_null(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -471,7 +471,7 @@ async def get_not_provided(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -548,7 +548,7 @@ async def get_int(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -644,7 +644,7 @@ async def put_int(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -706,7 +706,7 @@ async def get_long(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -803,7 +803,7 @@ async def put_long(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -865,7 +865,7 @@ async def get_float(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -964,7 +964,7 @@ async def put_float(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1027,7 +1027,7 @@ async def get_double(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1131,7 +1131,7 @@ async def put_double(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1193,7 +1193,7 @@ async def get_bool(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1290,7 +1290,7 @@ async def put_bool(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1353,7 +1353,7 @@ async def get_string(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1454,7 +1454,7 @@ async def put_string(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1516,7 +1516,7 @@ async def get_date(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1613,7 +1613,7 @@ async def put_date(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1675,7 +1675,7 @@ async def get_date_time(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1776,7 +1776,7 @@ async def put_date_time(self, complex_body: Union[JSON, IO[bytes]], **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1838,7 +1838,7 @@ async def get_date_time_rfc1123(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1941,7 +1941,7 @@ async def put_date_time_rfc1123(self, complex_body: Union[JSON, IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2002,7 +2002,7 @@ async def get_duration(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2099,7 +2099,7 @@ async def put_duration(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2160,7 +2160,7 @@ async def get_byte(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2257,7 +2257,7 @@ async def put_byte(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2340,7 +2340,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2443,7 +2443,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2506,7 +2506,7 @@ async def get_empty(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2607,7 +2607,7 @@ async def put_empty(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2670,7 +2670,7 @@ async def get_not_provided(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2748,7 +2748,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2852,7 +2852,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2915,7 +2915,7 @@ async def get_empty(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3016,7 +3016,7 @@ async def put_empty(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3079,7 +3079,7 @@ async def get_null(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3137,7 +3137,7 @@ async def get_not_provided(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3223,7 +3223,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3346,7 +3346,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3480,7 +3480,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3778,7 +3778,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3848,7 +3848,7 @@ async def get_dot_syntax(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3934,7 +3934,7 @@ async def get_composed_with_discriminator(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4020,7 +4020,7 @@ async def get_composed_without_discriminator(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4091,7 +4091,7 @@ async def get_complicated(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4220,7 +4220,7 @@ async def put_complicated(self, complex_body: Union[JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4411,7 +4411,7 @@ async def put_missing_discriminator(self, complex_body: Union[JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4708,7 +4708,7 @@ async def put_valid_missing_required(self, complex_body: Union[JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4842,7 +4842,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5200,7 +5200,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5282,7 +5282,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5380,7 +5380,7 @@ async def put_valid(self, complex_body: Union[JSON, IO[bytes]], **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5472,7 +5472,7 @@ async def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/operations/_operations.py index 13894ea8e60..20cd2eef86e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyComplexVersionTolerant/bodycomplexversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -928,7 +928,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1029,7 +1029,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1093,7 +1093,7 @@ def get_invalid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1151,7 +1151,7 @@ def get_empty(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1209,7 +1209,7 @@ def get_null(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1267,7 +1267,7 @@ def get_not_provided(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1344,7 +1344,7 @@ def get_int(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1442,7 +1442,7 @@ def put_int( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1504,7 +1504,7 @@ def get_long(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1603,7 +1603,7 @@ def put_long( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1665,7 +1665,7 @@ def get_float(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1764,7 +1764,7 @@ def put_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1827,7 +1827,7 @@ def get_double(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1931,7 +1931,7 @@ def put_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1993,7 +1993,7 @@ def get_bool(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2092,7 +2092,7 @@ def put_bool( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2155,7 +2155,7 @@ def get_string(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2256,7 +2256,7 @@ def put_string( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2318,7 +2318,7 @@ def get_date(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2417,7 +2417,7 @@ def put_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2479,7 +2479,7 @@ def get_date_time(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2580,7 +2580,7 @@ def put_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2642,7 +2642,7 @@ def get_date_time_rfc1123(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2747,7 +2747,7 @@ def put_date_time_rfc1123( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2808,7 +2808,7 @@ def get_duration(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2905,7 +2905,7 @@ def put_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2966,7 +2966,7 @@ def get_byte(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3065,7 +3065,7 @@ def put_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3148,7 +3148,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3251,7 +3251,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3314,7 +3314,7 @@ def get_empty(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3415,7 +3415,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3478,7 +3478,7 @@ def get_not_provided(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3556,7 +3556,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3660,7 +3660,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3723,7 +3723,7 @@ def get_empty(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3824,7 +3824,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3887,7 +3887,7 @@ def get_null(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3945,7 +3945,7 @@ def get_not_provided(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4031,7 +4031,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4154,7 +4154,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4288,7 +4288,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4586,7 +4586,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4656,7 +4656,7 @@ def get_dot_syntax(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4742,7 +4742,7 @@ def get_composed_with_discriminator(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4828,7 +4828,7 @@ def get_composed_without_discriminator(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4899,7 +4899,7 @@ def get_complicated(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5028,7 +5028,7 @@ def put_complicated( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5219,7 +5219,7 @@ def put_missing_discriminator(self, complex_body: Union[JSON, IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5518,7 +5518,7 @@ def put_valid_missing_required( # pylint: disable=inconsistent-return-statement 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5652,7 +5652,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6010,7 +6010,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6092,7 +6092,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6190,7 +6190,7 @@ def put_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -6282,7 +6282,7 @@ def get_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/aio/operations/_operations.py index cd1cb40380b..7566fd1e2d3 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -38,7 +38,7 @@ from .._configuration import AutoRestRFC1123DateTimeTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class Datetimerfc1123Operations: @@ -74,7 +74,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -122,7 +122,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -170,7 +170,7 @@ async def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -218,7 +218,7 @@ async def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -268,7 +268,7 @@ async def put_utc_max_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -314,7 +314,7 @@ async def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -362,7 +362,7 @@ async def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -412,7 +412,7 @@ async def put_utc_min_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -458,7 +458,7 @@ async def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/operations/_operations.py index eb6087eda57..81298a82654 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeRfc1123VersionTolerant/bodydatetimerfc1123versiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -206,7 +206,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -254,7 +254,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -302,7 +302,7 @@ def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -350,7 +350,7 @@ def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -402,7 +402,7 @@ def put_utc_max_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -448,7 +448,7 @@ def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -496,7 +496,7 @@ def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -548,7 +548,7 @@ def put_utc_min_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -594,7 +594,7 @@ def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/aio/operations/_operations.py index e82ed2f2bf5..6e1ee8405f8 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -52,7 +52,7 @@ from .._configuration import AutoRestDateTimeTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DatetimeOperations: # pylint: disable=too-many-public-methods @@ -88,7 +88,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -136,7 +136,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ async def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -232,7 +232,7 @@ async def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -282,7 +282,7 @@ async def put_utc_max_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -333,7 +333,7 @@ async def put_utc_max_date_time7_digits(self, datetime_body: datetime.datetime, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -379,7 +379,7 @@ async def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -427,7 +427,7 @@ async def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -478,7 +478,7 @@ async def get_utc_uppercase_max_date_time7_digits(self, **kwargs: Any) -> dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -528,7 +528,7 @@ async def put_local_positive_offset_max_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -576,7 +576,7 @@ async def get_local_positive_offset_lowercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -626,7 +626,7 @@ async def get_local_positive_offset_uppercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -676,7 +676,7 @@ async def put_local_negative_offset_max_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -724,7 +724,7 @@ async def get_local_negative_offset_uppercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -774,7 +774,7 @@ async def get_local_negative_offset_lowercase_max_date_time( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -824,7 +824,7 @@ async def put_utc_min_date_time(self, datetime_body: datetime.datetime, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -870,7 +870,7 @@ async def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -920,7 +920,7 @@ async def put_local_positive_offset_min_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -966,7 +966,7 @@ async def get_local_positive_offset_min_date_time(self, **kwargs: Any) -> dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1016,7 +1016,7 @@ async def put_local_negative_offset_min_date_time(self, datetime_body: datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1062,7 +1062,7 @@ async def get_local_negative_offset_min_date_time(self, **kwargs: Any) -> dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1110,7 +1110,7 @@ async def get_local_no_offset_min_date_time(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/operations/_operations.py index 520bc097314..4dbe4e357cc 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateTimeVersionTolerant/bodydatetimeversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -430,7 +430,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -478,7 +478,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -526,7 +526,7 @@ def get_overflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -574,7 +574,7 @@ def get_underflow(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -626,7 +626,7 @@ def put_utc_max_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -679,7 +679,7 @@ def put_utc_max_date_time7_digits( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -725,7 +725,7 @@ def get_utc_lowercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -773,7 +773,7 @@ def get_utc_uppercase_max_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -824,7 +824,7 @@ def get_utc_uppercase_max_date_time7_digits(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -876,7 +876,7 @@ def put_local_positive_offset_max_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -924,7 +924,7 @@ def get_local_positive_offset_lowercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -974,7 +974,7 @@ def get_local_positive_offset_uppercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1026,7 +1026,7 @@ def put_local_negative_offset_max_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1074,7 +1074,7 @@ def get_local_negative_offset_uppercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1124,7 +1124,7 @@ def get_local_negative_offset_lowercase_max_date_time( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1176,7 +1176,7 @@ def put_utc_min_date_time( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1222,7 +1222,7 @@ def get_utc_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1274,7 +1274,7 @@ def put_local_positive_offset_min_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1320,7 +1320,7 @@ def get_local_positive_offset_min_date_time(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1372,7 +1372,7 @@ def put_local_negative_offset_min_date_time( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1418,7 +1418,7 @@ def get_local_negative_offset_min_date_time(self, **kwargs: Any) -> datetime.dat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1466,7 +1466,7 @@ def get_local_no_offset_min_date_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/aio/operations/_operations.py index 4dad4798f38..90404204f5d 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -37,7 +37,7 @@ from .._configuration import AutoRestDateTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DateOperations: @@ -71,7 +71,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def get_invalid_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -167,7 +167,7 @@ async def get_overflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -215,7 +215,7 @@ async def get_underflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -265,7 +265,7 @@ async def put_max_date(self, date_body: datetime.date, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -311,7 +311,7 @@ async def get_max_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -361,7 +361,7 @@ async def put_min_date(self, date_body: datetime.date, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -407,7 +407,7 @@ async def get_min_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/operations/_operations.py index d8567b10056..4e2518685a7 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDateVersionTolerant/bodydateversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -182,7 +182,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -230,7 +230,7 @@ def get_invalid_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -278,7 +278,7 @@ def get_overflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -326,7 +326,7 @@ def get_underflow_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -378,7 +378,7 @@ def put_max_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def get_max_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -476,7 +476,7 @@ def put_min_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -522,7 +522,7 @@ def get_min_date(self, **kwargs: Any) -> datetime.date: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/aio/operations/_operations.py index 1f76bd2990f..80d69dae090 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/aio/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -97,7 +97,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DictionaryOperations: # pylint: disable=too-many-public-methods @@ -120,7 +120,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get_null(self, **kwargs: Any) -> Dict[str, int]: + async def get_null(self, **kwargs: Any) -> dict[str, int]: """Get null dictionary value. :return: dict mapping str to int @@ -141,12 +141,12 @@ async def get_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_null_request( headers=_headers, @@ -171,12 +171,12 @@ async def get_null(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace_async - async def get_empty(self, **kwargs: Any) -> Dict[str, int]: + async def get_empty(self, **kwargs: Any) -> dict[str, int]: """Get empty dictionary value {}. :return: dict mapping str to int @@ -197,12 +197,12 @@ async def get_empty(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_empty_request( headers=_headers, @@ -227,13 +227,13 @@ async def get_empty(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @overload async def put_empty( - self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {}. @@ -270,7 +270,7 @@ async def put_empty(self, array_body: IO[bytes], *, content_type: str = "applica """ @distributed_trace_async - async def put_empty(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any) -> None: + async def put_empty(self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {}. :param array_body: Is either a {str: str} type or a IO[bytes] type. Required. @@ -285,7 +285,7 @@ async def put_empty(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -325,7 +325,7 @@ async def put_empty(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_null_value(self, **kwargs: Any) -> Dict[str, str]: + async def get_null_value(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null value. :return: dict mapping str to str @@ -346,12 +346,12 @@ async def get_null_value(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_null_value_request( headers=_headers, @@ -376,12 +376,12 @@ async def get_null_value(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace_async - async def get_null_key(self, **kwargs: Any) -> Dict[str, str]: + async def get_null_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null key. :return: dict mapping str to str @@ -402,12 +402,12 @@ async def get_null_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_null_key_request( headers=_headers, @@ -432,12 +432,12 @@ async def get_null_key(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace_async - async def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: + async def get_empty_string_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with key as empty string. :return: dict mapping str to str @@ -458,12 +458,12 @@ async def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_empty_string_key_request( headers=_headers, @@ -488,12 +488,12 @@ async def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace_async - async def get_invalid(self, **kwargs: Any) -> Dict[str, str]: + async def get_invalid(self, **kwargs: Any) -> dict[str, str]: """Get invalid Dictionary value. :return: dict mapping str to str @@ -514,12 +514,12 @@ async def get_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_invalid_request( headers=_headers, @@ -544,12 +544,12 @@ async def get_invalid(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace_async - async def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: + async def get_boolean_tfft(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }. :return: dict mapping str to bool @@ -570,12 +570,12 @@ async def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_dictionary_get_boolean_tfft_request( headers=_headers, @@ -600,13 +600,13 @@ async def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bool], deserialized), {}) # type: ignore - return cast(Dict[str, bool], deserialized) # type: ignore + return cast(dict[str, bool], deserialized) # type: ignore @overload async def put_boolean_tfft( - self, array_body: Dict[str, bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. @@ -645,7 +645,7 @@ async def put_boolean_tfft( """ @distributed_trace_async - async def put_boolean_tfft(self, array_body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any) -> None: + async def put_boolean_tfft(self, array_body: Union[dict[str, bool], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. :param array_body: Is either a {str: bool} type or a IO[bytes] type. Required. @@ -660,7 +660,7 @@ async def put_boolean_tfft(self, array_body: Union[Dict[str, bool], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -700,7 +700,7 @@ async def put_boolean_tfft(self, array_body: Union[Dict[str, bool], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: + async def get_boolean_invalid_null(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": null, "2": false }. :return: dict mapping str to bool @@ -721,12 +721,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_dictionary_get_boolean_invalid_null_request( headers=_headers, @@ -751,12 +751,12 @@ async def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bool], deserialized), {}) # type: ignore - return cast(Dict[str, bool], deserialized) # type: ignore + return cast(dict[str, bool], deserialized) # type: ignore @distributed_trace_async - async def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: + async def get_boolean_invalid_string(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value '{"0": true, "1": "boolean", "2": false}'. :return: dict mapping str to bool @@ -777,12 +777,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_dictionary_get_boolean_invalid_string_request( headers=_headers, @@ -807,12 +807,12 @@ async def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bool], deserialized), {}) # type: ignore - return cast(Dict[str, bool], deserialized) # type: ignore + return cast(dict[str, bool], deserialized) # type: ignore @distributed_trace_async - async def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: + async def get_integer_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int @@ -833,12 +833,12 @@ async def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_integer_valid_request( headers=_headers, @@ -863,13 +863,13 @@ async def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @overload async def put_integer_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -908,7 +908,7 @@ async def put_integer_valid( """ @distributed_trace_async - async def put_integer_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> None: + async def put_integer_valid(self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. :param array_body: Is either a {str: int} type or a IO[bytes] type. Required. @@ -923,7 +923,7 @@ async def put_integer_valid(self, array_body: Union[Dict[str, int], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -963,7 +963,7 @@ async def put_integer_valid(self, array_body: Union[Dict[str, int], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + async def get_int_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int @@ -984,12 +984,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_int_invalid_null_request( headers=_headers, @@ -1014,12 +1014,12 @@ async def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace_async - async def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + async def get_int_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int @@ -1040,12 +1040,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_int_invalid_string_request( headers=_headers, @@ -1070,12 +1070,12 @@ async def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace_async - async def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: + async def get_long_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int @@ -1096,12 +1096,12 @@ async def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_long_valid_request( headers=_headers, @@ -1126,13 +1126,13 @@ async def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @overload async def put_long_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1171,7 +1171,7 @@ async def put_long_valid( """ @distributed_trace_async - async def put_long_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> None: + async def put_long_valid(self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. :param array_body: Is either a {str: int} type or a IO[bytes] type. Required. @@ -1186,7 +1186,7 @@ async def put_long_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1226,7 +1226,7 @@ async def put_long_valid(self, array_body: Union[Dict[str, int], IO[bytes]], **k return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + async def get_long_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int @@ -1247,12 +1247,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_long_invalid_null_request( headers=_headers, @@ -1277,12 +1277,12 @@ async def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace_async - async def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + async def get_long_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int @@ -1303,12 +1303,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_long_invalid_string_request( headers=_headers, @@ -1333,12 +1333,12 @@ async def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace_async - async def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: + async def get_float_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float @@ -1359,12 +1359,12 @@ async def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_float_valid_request( headers=_headers, @@ -1389,13 +1389,13 @@ async def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @overload async def put_float_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -1434,7 +1434,7 @@ async def put_float_valid( """ @distributed_trace_async - async def put_float_valid(self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> None: + async def put_float_valid(self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :param array_body: Is either a {str: float} type or a IO[bytes] type. Required. @@ -1449,7 +1449,7 @@ async def put_float_valid(self, array_body: Union[Dict[str, float], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1489,7 +1489,7 @@ async def put_float_valid(self, array_body: Union[Dict[str, float], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + async def get_float_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float @@ -1510,12 +1510,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_float_invalid_null_request( headers=_headers, @@ -1540,12 +1540,12 @@ async def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace_async - async def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + async def get_float_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float @@ -1566,12 +1566,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_float_invalid_string_request( headers=_headers, @@ -1596,12 +1596,12 @@ async def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace_async - async def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: + async def get_double_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float @@ -1622,12 +1622,12 @@ async def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_double_valid_request( headers=_headers, @@ -1652,13 +1652,13 @@ async def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @overload async def put_double_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -1697,7 +1697,7 @@ async def put_double_valid( """ @distributed_trace_async - async def put_double_valid(self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> None: + async def put_double_valid(self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :param array_body: Is either a {str: float} type or a IO[bytes] type. Required. @@ -1712,7 +1712,7 @@ async def put_double_valid(self, array_body: Union[Dict[str, float], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1752,7 +1752,7 @@ async def put_double_valid(self, array_body: Union[Dict[str, float], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + async def get_double_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float @@ -1773,12 +1773,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_double_invalid_null_request( headers=_headers, @@ -1803,12 +1803,12 @@ async def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace_async - async def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + async def get_double_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float @@ -1829,12 +1829,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_double_invalid_string_request( headers=_headers, @@ -1859,12 +1859,12 @@ async def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace_async - async def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: + async def get_string_valid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. :return: dict mapping str to str @@ -1885,12 +1885,12 @@ async def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_string_valid_request( headers=_headers, @@ -1915,13 +1915,13 @@ async def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @overload async def put_string_valid( - self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. @@ -1960,7 +1960,7 @@ async def put_string_valid( """ @distributed_trace_async - async def put_string_valid(self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any) -> None: + async def put_string_valid(self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. :param array_body: Is either a {str: str} type or a IO[bytes] type. Required. @@ -1975,7 +1975,7 @@ async def put_string_valid(self, array_body: Union[Dict[str, str], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2015,7 +2015,7 @@ async def put_string_valid(self, array_body: Union[Dict[str, str], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: + async def get_string_with_null(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": null, "2": "foo2"}. :return: dict mapping str to str @@ -2036,12 +2036,12 @@ async def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_string_with_null_request( headers=_headers, @@ -2066,12 +2066,12 @@ async def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace_async - async def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: + async def get_string_with_invalid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": 123, "2": "foo2"}. :return: dict mapping str to str @@ -2092,12 +2092,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_string_with_invalid_request( headers=_headers, @@ -2122,12 +2122,12 @@ async def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace_async - async def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: + async def get_date_valid(self, **kwargs: Any) -> dict[str, datetime.date]: """Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. :return: dict mapping str to date @@ -2148,12 +2148,12 @@ async def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_valid_request( headers=_headers, @@ -2178,13 +2178,13 @@ async def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.date], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.date], deserialized) # type: ignore + return cast(dict[str, datetime.date], deserialized) # type: ignore @overload async def put_date_valid( - self, array_body: Dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. @@ -2223,7 +2223,7 @@ async def put_date_valid( """ @distributed_trace_async - async def put_date_valid(self, array_body: Union[Dict[str, datetime.date], IO[bytes]], **kwargs: Any) -> None: + async def put_date_valid(self, array_body: Union[dict[str, datetime.date], IO[bytes]], **kwargs: Any) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. :param array_body: Is either a {str: datetime.date} type or a IO[bytes] type. Required. @@ -2238,7 +2238,7 @@ async def put_date_valid(self, array_body: Union[Dict[str, datetime.date], IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2278,7 +2278,7 @@ async def put_date_valid(self, array_body: Union[Dict[str, datetime.date], IO[by return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: + async def get_date_invalid_null(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}. :return: dict mapping str to date @@ -2299,12 +2299,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_invalid_null_request( headers=_headers, @@ -2329,12 +2329,12 @@ async def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date] deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.date], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.date], deserialized) # type: ignore + return cast(dict[str, datetime.date], deserialized) # type: ignore @distributed_trace_async - async def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: + async def get_date_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2011-03-22", "1": "date"}. :return: dict mapping str to date @@ -2355,12 +2355,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_invalid_chars_request( headers=_headers, @@ -2385,12 +2385,12 @@ async def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.date], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.date], deserialized) # type: ignore + return cast(dict[str, datetime.date], deserialized) # type: ignore @distributed_trace_async - async def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2412,12 +2412,12 @@ async def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetim 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_valid_request( headers=_headers, @@ -2442,13 +2442,13 @@ async def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetim deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @overload async def put_date_time_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2490,7 +2490,7 @@ async def put_date_time_valid( @distributed_trace_async async def put_date_time_valid( - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -2507,7 +2507,7 @@ async def put_date_time_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2547,7 +2547,7 @@ async def put_date_time_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_invalid_null(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": null}. :return: dict mapping str to datetime @@ -2568,12 +2568,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime. 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_invalid_null_request( headers=_headers, @@ -2598,12 +2598,12 @@ async def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime. deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @distributed_trace_async - async def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}. :return: dict mapping str to datetime @@ -2624,12 +2624,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_invalid_chars_request( headers=_headers, @@ -2654,12 +2654,12 @@ async def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @distributed_trace_async - async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time-rfc1123 dictionary value {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -2681,12 +2681,12 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_rfc1123_valid_request( headers=_headers, @@ -2711,13 +2711,13 @@ async def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @overload async def put_date_time_rfc1123_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -2759,7 +2759,7 @@ async def put_date_time_rfc1123_valid( @distributed_trace_async async def put_date_time_rfc1123_valid( - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -2776,7 +2776,7 @@ async def put_date_time_rfc1123_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2816,7 +2816,7 @@ async def put_date_time_rfc1123_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: + async def get_duration_valid(self, **kwargs: Any) -> dict[str, datetime.timedelta]: """Get duration dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. :return: dict mapping str to timedelta @@ -2837,12 +2837,12 @@ async def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.timedelta]] = kwargs.pop("cls", None) _request = build_dictionary_get_duration_valid_request( headers=_headers, @@ -2867,13 +2867,13 @@ async def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelt deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.timedelta], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.timedelta], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.timedelta], deserialized) # type: ignore + return cast(dict[str, datetime.timedelta], deserialized) # type: ignore @overload async def put_duration_valid( - self, array_body: Dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -2913,7 +2913,7 @@ async def put_duration_valid( @distributed_trace_async async def put_duration_valid( - self, array_body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -2929,7 +2929,7 @@ async def put_duration_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2969,7 +2969,7 @@ async def put_duration_valid( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: + async def get_byte_valid(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64. @@ -2991,12 +2991,12 @@ async def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_dictionary_get_byte_valid_request( headers=_headers, @@ -3021,13 +3021,13 @@ async def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bytes], deserialized), {}) # type: ignore - return cast(Dict[str, bytes], deserialized) # type: ignore + return cast(dict[str, bytes], deserialized) # type: ignore @overload async def put_byte_valid( - self, array_body: Dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -3068,7 +3068,7 @@ async def put_byte_valid( """ @distributed_trace_async - async def put_byte_valid(self, array_body: Union[Dict[str, bytes], IO[bytes]], **kwargs: Any) -> None: + async def put_byte_valid(self, array_body: Union[dict[str, bytes], IO[bytes]], **kwargs: Any) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -3084,7 +3084,7 @@ async def put_byte_valid(self, array_body: Union[Dict[str, bytes], IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3124,7 +3124,7 @@ async def put_byte_valid(self, array_body: Union[Dict[str, bytes], IO[bytes]], * return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: + async def get_byte_invalid_null(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded. @@ -3146,12 +3146,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_dictionary_get_byte_invalid_null_request( headers=_headers, @@ -3176,12 +3176,12 @@ async def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bytes], deserialized), {}) # type: ignore - return cast(Dict[str, bytes], deserialized) # type: ignore + return cast(dict[str, bytes], deserialized) # type: ignore @distributed_trace_async - async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: + async def get_base64_url(self, **kwargs: Any) -> dict[str, bytes]: """Get base64url dictionary value {"0": "a string that gets encoded with base64url", "1": "test string", "2": "Lorem ipsum"}. @@ -3203,12 +3203,12 @@ async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_dictionary_get_base64_url_request( headers=_headers, @@ -3233,12 +3233,12 @@ async def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bytes], deserialized), {}) # type: ignore - return cast(Dict[str, bytes], deserialized) # type: ignore + return cast(dict[str, bytes], deserialized) # type: ignore @distributed_trace_async - async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, JSON]]: + async def get_complex_null(self, **kwargs: Any) -> Optional[dict[str, JSON]]: """Get dictionary of complex type null value. :return: dict mapping str to JSON object or None @@ -3262,12 +3262,12 @@ async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, JSON]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, JSON]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, JSON]]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_null_request( headers=_headers, @@ -3292,12 +3292,12 @@ async def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, JSON]]: deserialized = None if cls: - return cls(pipeline_response, cast(Optional[Dict[str, JSON]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(Optional[dict[str, JSON]], deserialized), {}) # type: ignore - return cast(Optional[Dict[str, JSON]], deserialized) # type: ignore + return cast(Optional[dict[str, JSON]], deserialized) # type: ignore @distributed_trace_async - async def get_complex_empty(self, **kwargs: Any) -> Dict[str, JSON]: + async def get_complex_empty(self, **kwargs: Any) -> dict[str, JSON]: """Get empty dictionary of complex type {}. :return: dict mapping str to JSON object @@ -3321,12 +3321,12 @@ async def get_complex_empty(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_empty_request( headers=_headers, @@ -3351,12 +3351,12 @@ async def get_complex_empty(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, JSON]: + async def get_complex_item_null(self, **kwargs: Any) -> dict[str, JSON]: """Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}. @@ -3381,12 +3381,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_item_null_request( headers=_headers, @@ -3411,12 +3411,12 @@ async def get_complex_item_null(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, JSON]: + async def get_complex_item_empty(self, **kwargs: Any) -> dict[str, JSON]: """Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}. @@ -3441,12 +3441,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_item_empty_request( headers=_headers, @@ -3471,12 +3471,12 @@ async def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @distributed_trace_async - async def get_complex_valid(self, **kwargs: Any) -> Dict[str, JSON]: + async def get_complex_valid(self, **kwargs: Any) -> dict[str, JSON]: """Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3501,12 +3501,12 @@ async def get_complex_valid(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_valid_request( headers=_headers, @@ -3531,13 +3531,13 @@ async def get_complex_valid(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @overload async def put_complex_valid( - self, array_body: Dict[str, JSON], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, JSON], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3581,7 +3581,7 @@ async def put_complex_valid( """ @distributed_trace_async - async def put_complex_valid(self, array_body: Union[Dict[str, JSON], IO[bytes]], **kwargs: Any) -> None: + async def put_complex_valid(self, array_body: Union[dict[str, JSON], IO[bytes]], **kwargs: Any) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -3597,7 +3597,7 @@ async def put_complex_valid(self, array_body: Union[Dict[str, JSON], IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3637,7 +3637,7 @@ async def put_complex_valid(self, array_body: Union[Dict[str, JSON], IO[bytes]], return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: + async def get_array_null(self, **kwargs: Any) -> Optional[dict[str, list[str]]]: """Get a null array. :return: dict mapping str to list of str or None @@ -3660,12 +3660,12 @@ async def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, List[str]]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, list[str]]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_null_request( headers=_headers, @@ -3690,12 +3690,12 @@ async def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: deserialized = None if cls: - return cls(pipeline_response, cast(Optional[Dict[str, List[str]]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(Optional[dict[str, list[str]]], deserialized), {}) # type: ignore - return cast(Optional[Dict[str, List[str]]], deserialized) # type: ignore + return cast(Optional[dict[str, list[str]]], deserialized) # type: ignore @distributed_trace_async - async def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an empty dictionary {}. :return: dict mapping str to list of str @@ -3718,12 +3718,12 @@ async def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_empty_request( headers=_headers, @@ -3748,12 +3748,12 @@ async def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_item_null(self, **kwargs: Any) -> dict[str, list[str]]: """Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}. :return: dict mapping str to list of str @@ -3776,12 +3776,12 @@ async def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_item_null_request( headers=_headers, @@ -3806,12 +3806,12 @@ async def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_item_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}. :return: dict mapping str to list of str @@ -3834,12 +3834,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_item_empty_request( headers=_headers, @@ -3864,12 +3864,12 @@ async def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @distributed_trace_async - async def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: + async def get_array_valid(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -3893,12 +3893,12 @@ async def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_valid_request( headers=_headers, @@ -3923,13 +3923,13 @@ async def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @overload async def put_array_valid( - self, array_body: Dict[str, List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -3972,7 +3972,7 @@ async def put_array_valid( """ @distributed_trace_async - async def put_array_valid(self, array_body: Union[Dict[str, List[str]], IO[bytes]], **kwargs: Any) -> None: + async def put_array_valid(self, array_body: Union[dict[str, list[str]], IO[bytes]], **kwargs: Any) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -3988,7 +3988,7 @@ async def put_array_valid(self, array_body: Union[Dict[str, List[str]], IO[bytes 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4028,7 +4028,7 @@ async def put_array_valid(self, array_body: Union[Dict[str, List[str]], IO[bytes return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries with value null. :return: dict mapping str to dict mapping str to str @@ -4051,12 +4051,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_null_request( headers=_headers, @@ -4081,12 +4081,12 @@ async def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {}. :return: dict mapping str to dict mapping str to str @@ -4109,12 +4109,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_empty_request( headers=_headers, @@ -4139,12 +4139,12 @@ async def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]] deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_item_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -4168,12 +4168,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_item_null_request( headers=_headers, @@ -4198,12 +4198,12 @@ async def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, s deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_item_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -4227,12 +4227,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_item_empty_request( headers=_headers, @@ -4257,12 +4257,12 @@ async def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace_async - async def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + async def get_dictionary_valid(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -4287,12 +4287,12 @@ async def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_valid_request( headers=_headers, @@ -4317,13 +4317,13 @@ async def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]] deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @overload async def put_dictionary_valid( - self, array_body: Dict[str, Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -4369,7 +4369,7 @@ async def put_dictionary_valid( @distributed_trace_async async def put_dictionary_valid( - self, array_body: Union[Dict[str, Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -4387,7 +4387,7 @@ async def put_dictionary_valid( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/operations/_operations.py index daa572b62b4..0c6ef695c58 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDictionaryVersionTolerant/bodydictionaryversiontolerant/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import datetime from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1011,7 +1011,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get_null(self, **kwargs: Any) -> Dict[str, int]: + def get_null(self, **kwargs: Any) -> dict[str, int]: """Get null dictionary value. :return: dict mapping str to int @@ -1032,12 +1032,12 @@ def get_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_null_request( headers=_headers, @@ -1062,12 +1062,12 @@ def get_null(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace - def get_empty(self, **kwargs: Any) -> Dict[str, int]: + def get_empty(self, **kwargs: Any) -> dict[str, int]: """Get empty dictionary value {}. :return: dict mapping str to int @@ -1088,12 +1088,12 @@ def get_empty(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_empty_request( headers=_headers, @@ -1118,12 +1118,12 @@ def get_empty(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @overload - def put_empty(self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put_empty(self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: """Set dictionary value empty {}. :param array_body: Required. @@ -1160,7 +1160,7 @@ def put_empty(self, array_body: IO[bytes], *, content_type: str = "application/j @distributed_trace def put_empty( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {}. @@ -1176,7 +1176,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1216,7 +1216,7 @@ def put_empty( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_null_value(self, **kwargs: Any) -> Dict[str, str]: + def get_null_value(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null value. :return: dict mapping str to str @@ -1237,12 +1237,12 @@ def get_null_value(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_null_value_request( headers=_headers, @@ -1267,12 +1267,12 @@ def get_null_value(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace - def get_null_key(self, **kwargs: Any) -> Dict[str, str]: + def get_null_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with null key. :return: dict mapping str to str @@ -1293,12 +1293,12 @@ def get_null_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_null_key_request( headers=_headers, @@ -1323,12 +1323,12 @@ def get_null_key(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace - def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: + def get_empty_string_key(self, **kwargs: Any) -> dict[str, str]: """Get Dictionary with key as empty string. :return: dict mapping str to str @@ -1349,12 +1349,12 @@ def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_empty_string_key_request( headers=_headers, @@ -1379,12 +1379,12 @@ def get_empty_string_key(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace - def get_invalid(self, **kwargs: Any) -> Dict[str, str]: + def get_invalid(self, **kwargs: Any) -> dict[str, str]: """Get invalid Dictionary value. :return: dict mapping str to str @@ -1405,12 +1405,12 @@ def get_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_invalid_request( headers=_headers, @@ -1435,12 +1435,12 @@ def get_invalid(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace - def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: + def get_boolean_tfft(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": false, "2": false, "3": true }. :return: dict mapping str to bool @@ -1461,12 +1461,12 @@ def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_dictionary_get_boolean_tfft_request( headers=_headers, @@ -1491,13 +1491,13 @@ def get_boolean_tfft(self, **kwargs: Any) -> Dict[str, bool]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bool], deserialized), {}) # type: ignore - return cast(Dict[str, bool], deserialized) # type: ignore + return cast(dict[str, bool], deserialized) # type: ignore @overload def put_boolean_tfft( - self, array_body: Dict[str, bool], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bool], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. @@ -1535,7 +1535,7 @@ def put_boolean_tfft(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_boolean_tfft( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, bool], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": true, "1": false, "2": false, "3": true }. @@ -1551,7 +1551,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1591,7 +1591,7 @@ def put_boolean_tfft( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: + def get_boolean_invalid_null(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value {"0": true, "1": null, "2": false }. :return: dict mapping str to bool @@ -1612,12 +1612,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_dictionary_get_boolean_invalid_null_request( headers=_headers, @@ -1642,12 +1642,12 @@ def get_boolean_invalid_null(self, **kwargs: Any) -> Dict[str, bool]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bool], deserialized), {}) # type: ignore - return cast(Dict[str, bool], deserialized) # type: ignore + return cast(dict[str, bool], deserialized) # type: ignore @distributed_trace - def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: + def get_boolean_invalid_string(self, **kwargs: Any) -> dict[str, bool]: """Get boolean dictionary value '{"0": true, "1": "boolean", "2": false}'. :return: dict mapping str to bool @@ -1668,12 +1668,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_dictionary_get_boolean_invalid_string_request( headers=_headers, @@ -1698,12 +1698,12 @@ def get_boolean_invalid_string(self, **kwargs: Any) -> Dict[str, bool]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bool], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bool], deserialized), {}) # type: ignore - return cast(Dict[str, bool], deserialized) # type: ignore + return cast(dict[str, bool], deserialized) # type: ignore @distributed_trace - def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: + def get_integer_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int @@ -1724,12 +1724,12 @@ def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_integer_valid_request( headers=_headers, @@ -1754,13 +1754,13 @@ def get_integer_valid(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @overload def put_integer_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1800,7 +1800,7 @@ def put_integer_valid( @distributed_trace def put_integer_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -1816,7 +1816,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1856,7 +1856,7 @@ def put_integer_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + def get_int_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int @@ -1877,12 +1877,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_int_invalid_null_request( headers=_headers, @@ -1907,12 +1907,12 @@ def get_int_invalid_null(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace - def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + def get_int_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int @@ -1933,12 +1933,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_int_invalid_string_request( headers=_headers, @@ -1963,12 +1963,12 @@ def get_int_invalid_string(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace - def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: + def get_long_valid(self, **kwargs: Any) -> dict[str, int]: """Get integer dictionary value {"0": 1, "1": -1, "2": 3, "3": 300}. :return: dict mapping str to int @@ -1989,12 +1989,12 @@ def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_long_valid_request( headers=_headers, @@ -2019,13 +2019,13 @@ def get_long_valid(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @overload def put_long_valid( - self, array_body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -2063,7 +2063,7 @@ def put_long_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_long_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, int], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, int], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": 1, "1": -1, "2": 3, "3": 300}. @@ -2079,7 +2079,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2119,7 +2119,7 @@ def put_long_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: + def get_long_invalid_null(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": null, "2": 0}. :return: dict mapping str to int @@ -2140,12 +2140,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_long_invalid_null_request( headers=_headers, @@ -2170,12 +2170,12 @@ def get_long_invalid_null(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace - def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: + def get_long_invalid_string(self, **kwargs: Any) -> dict[str, int]: """Get long dictionary value {"0": 1, "1": "integer", "2": 0}. :return: dict mapping str to int @@ -2196,12 +2196,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_dictionary_get_long_invalid_string_request( headers=_headers, @@ -2226,12 +2226,12 @@ def get_long_invalid_string(self, **kwargs: Any) -> Dict[str, int]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace - def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: + def get_float_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float @@ -2252,12 +2252,12 @@ def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_float_valid_request( headers=_headers, @@ -2282,13 +2282,13 @@ def get_float_valid(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @overload def put_float_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2326,7 +2326,7 @@ def put_float_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_float_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2342,7 +2342,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2382,7 +2382,7 @@ def put_float_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + def get_float_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float @@ -2403,12 +2403,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_float_invalid_null_request( headers=_headers, @@ -2433,12 +2433,12 @@ def get_float_invalid_null(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace - def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + def get_float_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float @@ -2459,12 +2459,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_float_invalid_string_request( headers=_headers, @@ -2489,12 +2489,12 @@ def get_float_invalid_string(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace - def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: + def get_double_valid(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. :return: dict mapping str to float @@ -2515,12 +2515,12 @@ def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_double_valid_request( headers=_headers, @@ -2545,13 +2545,13 @@ def get_double_valid(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @overload def put_double_valid( - self, array_body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2589,7 +2589,7 @@ def put_double_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_double_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, float], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, float], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": 0, "1": -0.01, "2": 1.2e20}. @@ -2605,7 +2605,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2645,7 +2645,7 @@ def put_double_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: + def get_double_invalid_null(self, **kwargs: Any) -> dict[str, float]: """Get float dictionary value {"0": 0.0, "1": null, "2": 1.2e20}. :return: dict mapping str to float @@ -2666,12 +2666,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_double_invalid_null_request( headers=_headers, @@ -2696,12 +2696,12 @@ def get_double_invalid_null(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace - def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: + def get_double_invalid_string(self, **kwargs: Any) -> dict[str, float]: """Get boolean dictionary value {"0": 1.0, "1": "number", "2": 0.0}. :return: dict mapping str to float @@ -2722,12 +2722,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_dictionary_get_double_invalid_string_request( headers=_headers, @@ -2752,12 +2752,12 @@ def get_double_invalid_string(self, **kwargs: Any) -> Dict[str, float]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, float], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, float], deserialized), {}) # type: ignore - return cast(Dict[str, float], deserialized) # type: ignore + return cast(dict[str, float], deserialized) # type: ignore @distributed_trace - def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: + def get_string_valid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. :return: dict mapping str to str @@ -2778,12 +2778,12 @@ def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_string_valid_request( headers=_headers, @@ -2808,13 +2808,13 @@ def get_string_valid(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @overload def put_string_valid( - self, array_body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. @@ -2852,7 +2852,7 @@ def put_string_valid(self, array_body: IO[bytes], *, content_type: str = "applic @distributed_trace def put_string_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, str], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, str], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "foo1", "1": "foo2", "2": "foo3"}. @@ -2868,7 +2868,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2908,7 +2908,7 @@ def put_string_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: + def get_string_with_null(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": null, "2": "foo2"}. :return: dict mapping str to str @@ -2929,12 +2929,12 @@ def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_string_with_null_request( headers=_headers, @@ -2959,12 +2959,12 @@ def get_string_with_null(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace - def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: + def get_string_with_invalid(self, **kwargs: Any) -> dict[str, str]: """Get string dictionary value {"0": "foo", "1": 123, "2": "foo2"}. :return: dict mapping str to str @@ -2985,12 +2985,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_dictionary_get_string_with_invalid_request( headers=_headers, @@ -3015,12 +3015,12 @@ def get_string_with_invalid(self, **kwargs: Any) -> Dict[str, str]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, str], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, str], deserialized), {}) # type: ignore - return cast(Dict[str, str], deserialized) # type: ignore + return cast(dict[str, str], deserialized) # type: ignore @distributed_trace - def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: + def get_date_valid(self, **kwargs: Any) -> dict[str, datetime.date]: """Get integer dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. :return: dict mapping str to date @@ -3041,12 +3041,12 @@ def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_valid_request( headers=_headers, @@ -3071,13 +3071,13 @@ def get_date_valid(self, **kwargs: Any) -> Dict[str, datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.date], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.date], deserialized) # type: ignore + return cast(dict[str, datetime.date], deserialized) # type: ignore @overload def put_date_valid( - self, array_body: Dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.date], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. @@ -3115,7 +3115,7 @@ def put_date_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_date_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.date], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.date], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01", "1": "1980-01-02", "2": "1492-10-12"}. @@ -3131,7 +3131,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3171,7 +3171,7 @@ def put_date_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: + def get_date_invalid_null(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2012-01-01", "1": null, "2": "1776-07-04"}. :return: dict mapping str to date @@ -3192,12 +3192,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_invalid_null_request( headers=_headers, @@ -3222,12 +3222,12 @@ def get_date_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.date], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.date], deserialized) # type: ignore + return cast(dict[str, datetime.date], deserialized) # type: ignore @distributed_trace - def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: + def get_date_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.date]: """Get date dictionary value {"0": "2011-03-22", "1": "date"}. :return: dict mapping str to date @@ -3248,12 +3248,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.date]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.date]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_invalid_chars_request( headers=_headers, @@ -3278,12 +3278,12 @@ def get_date_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.date]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.date], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.date], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.date], deserialized) # type: ignore + return cast(dict[str, datetime.date], deserialized) # type: ignore @distributed_trace - def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -3305,12 +3305,12 @@ def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_valid_request( headers=_headers, @@ -3335,13 +3335,13 @@ def get_date_time_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @overload def put_date_time_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -3383,7 +3383,7 @@ def put_date_time_valid( @distributed_trace def put_date_time_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "2000-12-01t00:00:01z", "1": "1980-01-02T00:11:35+01:00", "2": "1492-10-12T10:15:01-08:00"}. @@ -3400,7 +3400,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3440,7 +3440,7 @@ def put_date_time_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_invalid_null(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": null}. :return: dict mapping str to datetime @@ -3461,12 +3461,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.dateti 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_invalid_null_request( headers=_headers, @@ -3491,12 +3491,12 @@ def get_date_time_invalid_null(self, **kwargs: Any) -> Dict[str, datetime.dateti deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @distributed_trace - def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_invalid_chars(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date dictionary value {"0": "2000-12-01t00:00:01z", "1": "date-time"}. :return: dict mapping str to datetime @@ -3517,12 +3517,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_invalid_chars_request( headers=_headers, @@ -3547,12 +3547,12 @@ def get_date_time_invalid_chars(self, **kwargs: Any) -> Dict[str, datetime.datet deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @distributed_trace - def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get_date_time_rfc1123_valid(self, **kwargs: Any) -> dict[str, datetime.datetime]: """Get date-time-rfc1123 dictionary value {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -3574,12 +3574,12 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datet 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_dictionary_get_date_time_rfc1123_valid_request( headers=_headers, @@ -3604,13 +3604,13 @@ def get_date_time_rfc1123_valid(self, **kwargs: Any) -> Dict[str, datetime.datet deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.datetime], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.datetime], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.datetime], deserialized) # type: ignore + return cast(dict[str, datetime.datetime], deserialized) # type: ignore @overload def put_date_time_rfc1123_valid( - self, array_body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -3652,7 +3652,7 @@ def put_date_time_rfc1123_valid( @distributed_trace def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value empty {"0": "Fri, 01 Dec 2000 00:00:01 GMT", "1": "Wed, 02 Jan 1980 00:11:35 GMT", "2": "Wed, 12 Oct 1492 10:15:01 GMT"}. @@ -3669,7 +3669,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3709,7 +3709,7 @@ def put_date_time_rfc1123_valid( # pylint: disable=inconsistent-return-statemen return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: + def get_duration_valid(self, **kwargs: Any) -> dict[str, datetime.timedelta]: """Get duration dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. :return: dict mapping str to timedelta @@ -3730,12 +3730,12 @@ def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.timedelta]] = kwargs.pop("cls", None) _request = build_dictionary_get_duration_valid_request( headers=_headers, @@ -3760,13 +3760,13 @@ def get_duration_valid(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, datetime.timedelta], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, datetime.timedelta], deserialized), {}) # type: ignore - return cast(Dict[str, datetime.timedelta], deserialized) # type: ignore + return cast(dict[str, datetime.timedelta], deserialized) # type: ignore @overload def put_duration_valid( - self, array_body: Dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -3806,7 +3806,7 @@ def put_duration_valid( @distributed_trace def put_duration_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """Set dictionary value {"0": "P123DT22H14M12.011S", "1": "P5DT1H0M0S"}. @@ -3822,7 +3822,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3862,7 +3862,7 @@ def put_duration_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: + def get_byte_valid(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each item encoded in base64. @@ -3884,12 +3884,12 @@ def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_dictionary_get_byte_valid_request( headers=_headers, @@ -3914,13 +3914,13 @@ def get_byte_valid(self, **kwargs: Any) -> Dict[str, bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bytes], deserialized), {}) # type: ignore - return cast(Dict[str, bytes], deserialized) # type: ignore + return cast(dict[str, bytes], deserialized) # type: ignore @overload def put_byte_valid( - self, array_body: Dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, bytes], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -3960,7 +3960,7 @@ def put_byte_valid(self, array_body: IO[bytes], *, content_type: str = "applicat @distributed_trace def put_byte_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, bytes], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, bytes], IO[bytes]], **kwargs: Any ) -> None: """Put the dictionary value {"0": hex(FF FF FF FA), "1": hex(01 02 03), "2": hex (25, 29, 43)} with each elementencoded in base 64. @@ -3977,7 +3977,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4017,7 +4017,7 @@ def put_byte_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: + def get_byte_invalid_null(self, **kwargs: Any) -> dict[str, bytes]: """Get byte dictionary value {"0": hex(FF FF FF FA), "1": null} with the first item base64 encoded. @@ -4039,12 +4039,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_dictionary_get_byte_invalid_null_request( headers=_headers, @@ -4069,12 +4069,12 @@ def get_byte_invalid_null(self, **kwargs: Any) -> Dict[str, bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bytes], deserialized), {}) # type: ignore - return cast(Dict[str, bytes], deserialized) # type: ignore + return cast(dict[str, bytes], deserialized) # type: ignore @distributed_trace - def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: + def get_base64_url(self, **kwargs: Any) -> dict[str, bytes]: """Get base64url dictionary value {"0": "a string that gets encoded with base64url", "1": "test string", "2": "Lorem ipsum"}. @@ -4096,12 +4096,12 @@ def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bytes]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bytes]] = kwargs.pop("cls", None) _request = build_dictionary_get_base64_url_request( headers=_headers, @@ -4126,12 +4126,12 @@ def get_base64_url(self, **kwargs: Any) -> Dict[str, bytes]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, bytes], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, bytes], deserialized), {}) # type: ignore - return cast(Dict[str, bytes], deserialized) # type: ignore + return cast(dict[str, bytes], deserialized) # type: ignore @distributed_trace - def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, JSON]]: + def get_complex_null(self, **kwargs: Any) -> Optional[dict[str, JSON]]: """Get dictionary of complex type null value. :return: dict mapping str to JSON object or None @@ -4155,12 +4155,12 @@ def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, JSON]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, JSON]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, JSON]]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_null_request( headers=_headers, @@ -4185,12 +4185,12 @@ def get_complex_null(self, **kwargs: Any) -> Optional[Dict[str, JSON]]: deserialized = None if cls: - return cls(pipeline_response, cast(Optional[Dict[str, JSON]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(Optional[dict[str, JSON]], deserialized), {}) # type: ignore - return cast(Optional[Dict[str, JSON]], deserialized) # type: ignore + return cast(Optional[dict[str, JSON]], deserialized) # type: ignore @distributed_trace - def get_complex_empty(self, **kwargs: Any) -> Dict[str, JSON]: + def get_complex_empty(self, **kwargs: Any) -> dict[str, JSON]: """Get empty dictionary of complex type {}. :return: dict mapping str to JSON object @@ -4214,12 +4214,12 @@ def get_complex_empty(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_empty_request( headers=_headers, @@ -4244,12 +4244,12 @@ def get_complex_empty(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @distributed_trace - def get_complex_item_null(self, **kwargs: Any) -> Dict[str, JSON]: + def get_complex_item_null(self, **kwargs: Any) -> dict[str, JSON]: """Get dictionary of complex type with null item {"0": {"integer": 1, "string": "2"}, "1": null, "2": {"integer": 5, "string": "6"}}. @@ -4274,12 +4274,12 @@ def get_complex_item_null(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_item_null_request( headers=_headers, @@ -4304,12 +4304,12 @@ def get_complex_item_null(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @distributed_trace - def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, JSON]: + def get_complex_item_empty(self, **kwargs: Any) -> dict[str, JSON]: """Get dictionary of complex type with empty item {"0": {"integer": 1, "string": "2"}, "1:" {}, "2": {"integer": 5, "string": "6"}}. @@ -4334,12 +4334,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_item_empty_request( headers=_headers, @@ -4364,12 +4364,12 @@ def get_complex_item_empty(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @distributed_trace - def get_complex_valid(self, **kwargs: Any) -> Dict[str, JSON]: + def get_complex_valid(self, **kwargs: Any) -> dict[str, JSON]: """Get dictionary of complex type with {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -4394,12 +4394,12 @@ def get_complex_valid(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_dictionary_get_complex_valid_request( headers=_headers, @@ -4424,13 +4424,13 @@ def get_complex_valid(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @overload def put_complex_valid( - self, array_body: Dict[str, JSON], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, JSON], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -4475,7 +4475,7 @@ def put_complex_valid( @distributed_trace def put_complex_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, JSON], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, JSON], IO[bytes]], **kwargs: Any ) -> None: """Put an dictionary of complex type with values {"0": {"integer": 1, "string": "2"}, "1": {"integer": 3, "string": "4"}, "2": {"integer": 5, "string": "6"}}. @@ -4492,7 +4492,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4532,7 +4532,7 @@ def put_complex_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: + def get_array_null(self, **kwargs: Any) -> Optional[dict[str, list[str]]]: """Get a null array. :return: dict mapping str to list of str or None @@ -4555,12 +4555,12 @@ def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[Dict[str, List[str]]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[dict[str, list[str]]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_null_request( headers=_headers, @@ -4585,12 +4585,12 @@ def get_array_null(self, **kwargs: Any) -> Optional[Dict[str, List[str]]]: deserialized = None if cls: - return cls(pipeline_response, cast(Optional[Dict[str, List[str]]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(Optional[dict[str, list[str]]], deserialized), {}) # type: ignore - return cast(Optional[Dict[str, List[str]]], deserialized) # type: ignore + return cast(Optional[dict[str, list[str]]], deserialized) # type: ignore @distributed_trace - def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an empty dictionary {}. :return: dict mapping str to list of str @@ -4613,12 +4613,12 @@ def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_empty_request( headers=_headers, @@ -4643,12 +4643,12 @@ def get_array_empty(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @distributed_trace - def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_item_null(self, **kwargs: Any) -> dict[str, list[str]]: """Get an dictionary of array of strings {"0": ["1", "2", "3"], "1": null, "2": ["7", "8", "9"]}. :return: dict mapping str to list of str @@ -4671,12 +4671,12 @@ def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_item_null_request( headers=_headers, @@ -4701,12 +4701,12 @@ def get_array_item_null(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @distributed_trace - def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_item_empty(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings [{"0": ["1", "2", "3"], "1": [], "2": ["7", "8", "9"]}. :return: dict mapping str to list of str @@ -4729,12 +4729,12 @@ def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_item_empty_request( headers=_headers, @@ -4759,12 +4759,12 @@ def get_array_item_empty(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @distributed_trace - def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: + def get_array_valid(self, **kwargs: Any) -> dict[str, list[str]]: """Get an array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -4788,12 +4788,12 @@ def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, List[str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, list[str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_array_valid_request( headers=_headers, @@ -4818,13 +4818,13 @@ def get_array_valid(self, **kwargs: Any) -> Dict[str, List[str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, List[str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, list[str]], deserialized), {}) # type: ignore - return cast(Dict[str, List[str]], deserialized) # type: ignore + return cast(dict[str, list[str]], deserialized) # type: ignore @overload def put_array_valid( - self, array_body: Dict[str, List[str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, list[str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -4866,7 +4866,7 @@ def put_array_valid(self, array_body: IO[bytes], *, content_type: str = "applica @distributed_trace def put_array_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, List[str]], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, list[str]], IO[bytes]], **kwargs: Any ) -> None: """Put An array of array of strings {"0": ["1", "2", "3"], "1": ["4", "5", "6"], "2": ["7", "8", "9"]}. @@ -4883,7 +4883,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4923,7 +4923,7 @@ def put_array_valid( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries with value null. :return: dict mapping str to dict mapping str to str @@ -4946,12 +4946,12 @@ def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_null_request( headers=_headers, @@ -4976,12 +4976,12 @@ def get_dictionary_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {}. :return: dict mapping str to dict mapping str to str @@ -5004,12 +5004,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_empty_request( headers=_headers, @@ -5034,12 +5034,12 @@ def get_dictionary_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_item_null(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": null, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -5063,12 +5063,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_item_null_request( headers=_headers, @@ -5093,12 +5093,12 @@ def get_dictionary_item_null(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_item_empty(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -5122,12 +5122,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_item_empty_request( headers=_headers, @@ -5152,12 +5152,12 @@ def get_dictionary_item_empty(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @distributed_trace - def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: + def get_dictionary_valid(self, **kwargs: Any) -> dict[str, dict[str, str]]: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": "eight", "9": "nine"}}. @@ -5182,12 +5182,12 @@ def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Dict[str, str]]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, dict[str, str]]] = kwargs.pop("cls", None) _request = build_dictionary_get_dictionary_valid_request( headers=_headers, @@ -5212,13 +5212,13 @@ def get_dictionary_valid(self, **kwargs: Any) -> Dict[str, Dict[str, str]]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, Dict[str, str]], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, dict[str, str]], deserialized), {}) # type: ignore - return cast(Dict[str, Dict[str, str]], deserialized) # type: ignore + return cast(dict[str, dict[str, str]], deserialized) # type: ignore @overload def put_dictionary_valid( - self, array_body: Dict[str, Dict[str, str]], *, content_type: str = "application/json", **kwargs: Any + self, array_body: dict[str, dict[str, str]], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -5264,7 +5264,7 @@ def put_dictionary_valid( @distributed_trace def put_dictionary_valid( # pylint: disable=inconsistent-return-statements - self, array_body: Union[Dict[str, Dict[str, str]], IO[bytes]], **kwargs: Any + self, array_body: Union[dict[str, dict[str, str]], IO[bytes]], **kwargs: Any ) -> None: """Get an dictionaries of dictionaries of type with value {"0": {"1": "one", "2": "two", "3": "three"}, "1": {"4": "four", "5": "five", "6": "six"}, "2": {"7": "seven", "8": @@ -5282,7 +5282,7 @@ def put_dictionary_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py index 0b866955e48..37c205a7ded 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ from .._configuration import AutoRestDurationTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class DurationOperations: @@ -69,7 +69,7 @@ async def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -119,7 +119,7 @@ async def put_positive_duration(self, duration_body: datetime.timedelta, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -165,7 +165,7 @@ async def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -213,7 +213,7 @@ async def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py index fc23edc0362..eb6ad2b0717 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyDurationVersionTolerant/bodydurationversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -127,7 +127,7 @@ def get_null(self, **kwargs: Any) -> Optional[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -179,7 +179,7 @@ def put_positive_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -225,7 +225,7 @@ def get_positive_duration(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -273,7 +273,7 @@ def get_invalid(self, **kwargs: Any) -> datetime.timedelta: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/aio/operations/_operations.py index 1bf47b89dfc..46d7b03fdea 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar, cast +from typing import Any, AsyncIterator, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._configuration import AutoRestSwaggerBATFileServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FilesOperations: @@ -68,7 +68,7 @@ async def get_file(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -117,7 +117,7 @@ async def get_file_large(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -166,7 +166,7 @@ async def get_empty_file(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/operations/_operations.py index de6440c282d..78c8c25be79 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFileVersionTolerant/bodyfileversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Optional, TypeVar, cast +from typing import Any, Callable, Iterator, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -109,7 +109,7 @@ def get_file(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -158,7 +158,7 @@ def get_file_large(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -207,7 +207,7 @@ def get_empty_file(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/aio/operations/_operations.py index 9bf28c70332..9f6546615d2 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, cast +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import AutoRestSwaggerBATFormDataServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FormdataOperations: # pylint: disable=abstract-class-instantiated @@ -76,7 +76,7 @@ async def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/operations/_operations.py index 32d3f059c5c..716a3ba0559 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormDataVersionTolerant/bodyformdataversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, cast +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import raise_if_not_implemented T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -97,7 +97,7 @@ def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) -> Iterat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormUrlEncodedDataVersionTolerant/bodyformurlencodeddataversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormUrlEncodedDataVersionTolerant/bodyformurlencodeddataversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormUrlEncodedDataVersionTolerant/bodyformurlencodeddataversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyFormUrlEncodedDataVersionTolerant/bodyformurlencodeddataversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/aio/operations/_operations.py index 1c79f0406f6..57e0cb6ab33 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -43,7 +43,7 @@ from .._configuration import AutoRestIntegerTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class IntOperations: @@ -79,7 +79,7 @@ async def get_null(self, **kwargs: Any) -> Optional[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -127,7 +127,7 @@ async def get_invalid(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -175,7 +175,7 @@ async def get_overflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -223,7 +223,7 @@ async def get_underflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -271,7 +271,7 @@ async def get_overflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -319,7 +319,7 @@ async def get_underflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -369,7 +369,7 @@ async def put_max32(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -417,7 +417,7 @@ async def put_max64(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -465,7 +465,7 @@ async def put_min32(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -513,7 +513,7 @@ async def put_min64(self, int_body: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -559,7 +559,7 @@ async def get_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -609,7 +609,7 @@ async def put_unix_time_date(self, int_body: datetime.datetime, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -655,7 +655,7 @@ async def get_invalid_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -703,7 +703,7 @@ async def get_null_unix_time(self, **kwargs: Any) -> Optional[datetime.datetime] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/operations/_operations.py index b9f0b8f0c82..7bc8154d186 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyIntegerVersionTolerant/bodyintegerversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -279,7 +279,7 @@ def get_null(self, **kwargs: Any) -> Optional[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -327,7 +327,7 @@ def get_invalid(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -375,7 +375,7 @@ def get_overflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -423,7 +423,7 @@ def get_underflow_int32(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -471,7 +471,7 @@ def get_overflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -519,7 +519,7 @@ def get_underflow_int64(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -569,7 +569,7 @@ def put_max32(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -617,7 +617,7 @@ def put_max64(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -665,7 +665,7 @@ def put_min32(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -713,7 +713,7 @@ def put_min64(self, int_body: int, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -759,7 +759,7 @@ def get_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -811,7 +811,7 @@ def put_unix_time_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -857,7 +857,7 @@ def get_invalid_unix_time(self, **kwargs: Any) -> datetime.datetime: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -905,7 +905,7 @@ def get_null_unix_time(self, **kwargs: Any) -> Optional[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/aio/operations/_operations.py index 4b759965006..f69f7bf47bb 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -53,7 +53,7 @@ from .._configuration import AutoRestNumberTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class NumberOperations: # pylint: disable=too-many-public-methods @@ -87,7 +87,7 @@ async def get_null(self, **kwargs: Any) -> Optional[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -135,7 +135,7 @@ async def get_invalid_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -183,7 +183,7 @@ async def get_invalid_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ async def get_invalid_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -281,7 +281,7 @@ async def put_big_float(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -327,7 +327,7 @@ async def get_big_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -377,7 +377,7 @@ async def put_big_double(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -423,7 +423,7 @@ async def get_big_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -471,7 +471,7 @@ async def put_big_double_positive_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -518,7 +518,7 @@ async def get_big_double_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -566,7 +566,7 @@ async def put_big_double_negative_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -613,7 +613,7 @@ async def get_big_double_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -663,7 +663,7 @@ async def put_big_decimal(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -709,7 +709,7 @@ async def get_big_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -757,7 +757,7 @@ async def put_big_decimal_positive_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -804,7 +804,7 @@ async def get_big_decimal_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -852,7 +852,7 @@ async def put_big_decimal_negative_decimal(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -899,7 +899,7 @@ async def get_big_decimal_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -949,7 +949,7 @@ async def put_small_float(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -995,7 +995,7 @@ async def get_small_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1045,7 +1045,7 @@ async def put_small_double(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1091,7 +1091,7 @@ async def get_small_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1141,7 +1141,7 @@ async def put_small_decimal(self, number_body: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1187,7 +1187,7 @@ async def get_small_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/operations/_operations.py index 5174d783634..ce6932e9d1a 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyNumberVersionTolerant/bodynumberversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -442,7 +442,7 @@ def get_null(self, **kwargs: Any) -> Optional[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -490,7 +490,7 @@ def get_invalid_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -538,7 +538,7 @@ def get_invalid_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -586,7 +586,7 @@ def get_invalid_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -638,7 +638,7 @@ def put_big_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -684,7 +684,7 @@ def get_big_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -736,7 +736,7 @@ def put_big_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -782,7 +782,7 @@ def get_big_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -830,7 +830,7 @@ def put_big_double_positive_decimal(self, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -877,7 +877,7 @@ def get_big_double_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -925,7 +925,7 @@ def put_big_double_negative_decimal(self, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -972,7 +972,7 @@ def get_big_double_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1024,7 +1024,7 @@ def put_big_decimal( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1070,7 +1070,7 @@ def get_big_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1118,7 +1118,7 @@ def put_big_decimal_positive_decimal(self, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1165,7 +1165,7 @@ def get_big_decimal_positive_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1213,7 +1213,7 @@ def put_big_decimal_negative_decimal(self, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1260,7 +1260,7 @@ def get_big_decimal_negative_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1312,7 +1312,7 @@ def put_small_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1358,7 +1358,7 @@ def get_small_float(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1410,7 +1410,7 @@ def put_small_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1456,7 +1456,7 @@ def get_small_double(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1508,7 +1508,7 @@ def put_small_decimal( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1554,7 +1554,7 @@ def get_small_decimal(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/aio/operations/_operations.py index 640112131a0..80bf381917e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -49,7 +49,7 @@ from .._configuration import AutoRestSwaggerBATServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] @@ -84,7 +84,7 @@ async def get_null(self, **kwargs: Any) -> Optional[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -134,7 +134,7 @@ async def put_null(self, string_body: Optional[str] = None, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -183,7 +183,7 @@ async def get_empty(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ async def put_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -278,7 +278,7 @@ async def get_mbcs(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -326,7 +326,7 @@ async def put_mbcs(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -380,7 +380,7 @@ async def get_whitespace(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -430,7 +430,7 @@ async def put_whitespace(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -479,7 +479,7 @@ async def get_not_provided(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -527,7 +527,7 @@ async def get_base64_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -575,7 +575,7 @@ async def get_base64_url_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -625,7 +625,7 @@ async def put_base64_url_encoded(self, string_body: bytes, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -671,7 +671,7 @@ async def get_null_base64_url_encoded(self, **kwargs: Any) -> Optional[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -737,7 +737,7 @@ async def get_not_expandable(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -788,7 +788,7 @@ async def put_not_expandable(self, string_body: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -834,7 +834,7 @@ async def get_referenced(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -885,7 +885,7 @@ async def put_referenced(self, enum_string_body: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -940,7 +940,7 @@ async def get_referenced_constant(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1040,7 +1040,7 @@ async def put_referenced_constant(self, enum_string_body: Union[JSON, IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/operations/_operations.py index f7bc5b7c452..5e769d40e8c 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyStringVersionTolerant/bodystringversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] _SERIALIZER = Serializer() @@ -368,7 +368,7 @@ def get_null(self, **kwargs: Any) -> Optional[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -420,7 +420,7 @@ def put_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -469,7 +469,7 @@ def get_empty(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -517,7 +517,7 @@ def put_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -564,7 +564,7 @@ def get_mbcs(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -612,7 +612,7 @@ def put_mbcs(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -666,7 +666,7 @@ def get_whitespace(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -716,7 +716,7 @@ def put_whitespace(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -765,7 +765,7 @@ def get_not_provided(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -813,7 +813,7 @@ def get_base64_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -861,7 +861,7 @@ def get_base64_url_encoded(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -913,7 +913,7 @@ def put_base64_url_encoded( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -959,7 +959,7 @@ def get_null_base64_url_encoded(self, **kwargs: Any) -> Optional[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1025,7 +1025,7 @@ def get_not_expandable(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1078,7 +1078,7 @@ def put_not_expandable( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1124,7 +1124,7 @@ def get_referenced(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1177,7 +1177,7 @@ def put_referenced( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1232,7 +1232,7 @@ def get_referenced_constant(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1334,7 +1334,7 @@ def put_referenced_constant( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/aio/operations/_operations.py index ab3aaa64d6d..1575fc6699c 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import AutoRestTimeTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class TimeOperations: @@ -62,7 +62,7 @@ async def get(self, **kwargs: Any) -> datetime.time: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -112,7 +112,7 @@ async def put(self, time_body: datetime.time, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/operations/_operations.py index 7714d01f719..28cf8007a8d 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/BodyTimeVersionTolerant/bodytimeversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -95,7 +95,7 @@ def get(self, **kwargs: Any) -> datetime.time: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ def put(self, time_body: datetime.time, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_operations/_operations.py index cbf6b3b8b16..834d2c2f1e2 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, Union +from typing import Any, Callable, Optional, TypeVar, Union from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -64,7 +64,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/aio/_operations/_operations.py index ecf5633b0e5..2b08e11b25c 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ClientEnumVersionTolerant/clientenumversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import ClientWithEnumConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ClientWithEnumOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/aio/operations/_operations.py index 1b3afa72110..dbf27b55952 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -45,7 +45,7 @@ from .._configuration import AutoRestSwaggerConstantServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ContantsOperations: @@ -87,7 +87,7 @@ async def put_no_model_as_string_no_required_two_value_no_default( # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -135,7 +135,7 @@ async def put_no_model_as_string_no_required_two_value_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -183,7 +183,7 @@ async def put_no_model_as_string_no_required_one_value_no_default( # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ async def put_no_model_as_string_no_required_one_value_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -279,7 +279,7 @@ async def put_no_model_as_string_required_two_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -327,7 +327,7 @@ async def put_no_model_as_string_required_two_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -373,7 +373,7 @@ async def put_no_model_as_string_required_one_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -420,7 +420,7 @@ async def put_no_model_as_string_required_one_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -469,7 +469,7 @@ async def put_model_as_string_no_required_two_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -517,7 +517,7 @@ async def put_model_as_string_no_required_two_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -565,7 +565,7 @@ async def put_model_as_string_no_required_one_value_no_default( # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -613,7 +613,7 @@ async def put_model_as_string_no_required_one_value_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -661,7 +661,7 @@ async def put_model_as_string_required_two_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -709,7 +709,7 @@ async def put_model_as_string_required_two_value_default( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -757,7 +757,7 @@ async def put_model_as_string_required_one_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -805,7 +805,7 @@ async def put_model_as_string_required_one_value_default( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -848,7 +848,7 @@ async def put_client_constants(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/operations/_operations.py index 2e68ab6f43f..79ebf3263e8 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ConstantsVersionTolerant/constantsversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -330,7 +330,7 @@ def put_no_model_as_string_no_required_two_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -378,7 +378,7 @@ def put_no_model_as_string_no_required_two_value_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -426,7 +426,7 @@ def put_no_model_as_string_no_required_one_value_no_default( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -474,7 +474,7 @@ def put_no_model_as_string_no_required_one_value_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -522,7 +522,7 @@ def put_no_model_as_string_required_two_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -570,7 +570,7 @@ def put_no_model_as_string_required_two_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -616,7 +616,7 @@ def put_no_model_as_string_required_one_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -663,7 +663,7 @@ def put_no_model_as_string_required_one_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -712,7 +712,7 @@ def put_model_as_string_no_required_two_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -760,7 +760,7 @@ def put_model_as_string_no_required_two_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -808,7 +808,7 @@ def put_model_as_string_no_required_one_value_no_default( # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -856,7 +856,7 @@ def put_model_as_string_no_required_one_value_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -904,7 +904,7 @@ def put_model_as_string_required_two_value_no_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -952,7 +952,7 @@ def put_model_as_string_required_two_value_default( # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1000,7 +1000,7 @@ def put_model_as_string_required_one_value_no_default( # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1048,7 +1048,7 @@ def put_model_as_string_required_one_value_default( # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1091,7 +1091,7 @@ def put_client_constants(self, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/aio/operations/_operations.py index 835e0bc3b57..388d9ed363d 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._configuration import AutoRestParameterizedCustomHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: @@ -72,7 +72,7 @@ async def get_empty( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/operations/_operations.py index 129044440e9..8acde219a96 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriMoreOptionsVersionTolerant/custombaseurlmoreoptionsversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -102,7 +102,7 @@ def get_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py index f22ba71db4f..49c3cc19e9f 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._configuration import AutoRestParameterizedHostTestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: @@ -64,7 +64,7 @@ async def get_empty(self, account_name: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py index 0282f2803ce..4c6df4965a8 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/CustomBaseUriVersionTolerant/custombaseurlversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -81,7 +81,7 @@ def get_empty(self, account_name: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_operations/_operations.py index 0c8dc1af753..0a6699d7357 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -91,7 +91,7 @@ def create_secret(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def get_error_with_secrets(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_operations/_operations.py index ec15c716ef7..94239fb194e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ErrorWithSecretsVersionTolerant/errorwithsecretsversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ErrorWithSecretsOperationsMixin( @@ -61,7 +61,7 @@ async def create_secret(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -109,7 +109,7 @@ async def get_error_with_secrets(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/aio/operations/_operations.py index 0fe88bf6ec2..d5e1cba50ab 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PetOperations: @@ -75,7 +75,7 @@ async def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -202,7 +202,7 @@ async def add_pet(self, pet_param: Optional[Union[JSON, IO[bytes]]] = None, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/operations/_operations.py index 7a93daaae34..f6a80e768b7 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ExtensibleEnumsVersionTolerant/extensibleenumsswaggerversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -113,7 +113,7 @@ def get_by_pet_id(self, pet_id: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -240,7 +240,7 @@ def add_pet(self, pet_param: Optional[Union[JSON, IO[bytes]]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/aio/operations/_operations.py index 3efe5e2eb49..1fdcb70f5b5 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -58,7 +58,7 @@ from .._configuration import AutoRestSwaggerBATHeaderServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: # pylint: disable=too-many-public-methods @@ -97,7 +97,7 @@ async def param_existing_key(self, *, user_agent_parameter: str, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ async def response_existing_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -183,7 +183,7 @@ async def param_protected_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -226,7 +226,7 @@ async def response_protected_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -276,7 +276,7 @@ async def param_integer(self, *, scenario: str, value: int, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -322,7 +322,7 @@ async def response_integer(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -373,7 +373,7 @@ async def param_long(self, *, scenario: str, value: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -419,7 +419,7 @@ async def response_long(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -470,7 +470,7 @@ async def param_float(self, *, scenario: str, value: float, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -516,7 +516,7 @@ async def response_float(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -567,7 +567,7 @@ async def param_double(self, *, scenario: str, value: float, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -613,7 +613,7 @@ async def response_double(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -664,7 +664,7 @@ async def param_bool(self, *, scenario: str, value: bool, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -710,7 +710,7 @@ async def response_bool(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -762,7 +762,7 @@ async def param_string(self, *, scenario: str, value: Optional[str] = None, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -808,7 +808,7 @@ async def response_string(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -859,7 +859,7 @@ async def param_date(self, *, scenario: str, value: datetime.date, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -905,7 +905,7 @@ async def response_date(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -957,7 +957,7 @@ async def param_datetime(self, *, scenario: str, value: datetime.datetime, **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1003,7 +1003,7 @@ async def response_datetime(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1057,7 +1057,7 @@ async def param_datetime_rfc1123( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1104,7 +1104,7 @@ async def response_datetime_rfc1123(self, *, scenario: str, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1153,7 +1153,7 @@ async def param_duration(self, *, scenario: str, value: datetime.timedelta, **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1198,7 +1198,7 @@ async def response_duration(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1247,7 +1247,7 @@ async def param_byte(self, *, scenario: str, value: bytes, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1292,7 +1292,7 @@ async def response_byte(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1344,7 +1344,7 @@ async def param_enum(self, *, scenario: str, value: Optional[str] = None, **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1390,7 +1390,7 @@ async def response_enum(self, *, scenario: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1436,7 +1436,7 @@ async def custom_request_id(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/operations/_operations.py index 36db7f6f427..da2c3c6e8e9 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HeaderVersionTolerant/headerversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -524,7 +524,7 @@ def param_existing_key( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -566,7 +566,7 @@ def response_existing_key(self, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -610,7 +610,7 @@ def param_protected_key(self, **kwargs: Any) -> None: # pylint: disable=inconsi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -653,7 +653,7 @@ def response_protected_key(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -705,7 +705,7 @@ def param_integer( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -753,7 +753,7 @@ def response_integer( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -806,7 +806,7 @@ def param_long( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -852,7 +852,7 @@ def response_long(self, *, scenario: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -905,7 +905,7 @@ def param_float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -951,7 +951,7 @@ def response_float(self, *, scenario: str, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1004,7 +1004,7 @@ def param_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1052,7 +1052,7 @@ def response_double( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1105,7 +1105,7 @@ def param_bool( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1151,7 +1151,7 @@ def response_bool(self, *, scenario: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1205,7 +1205,7 @@ def param_string( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1253,7 +1253,7 @@ def response_string( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1306,7 +1306,7 @@ def param_date( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1352,7 +1352,7 @@ def response_date(self, *, scenario: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1406,7 +1406,7 @@ def param_datetime( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1454,7 +1454,7 @@ def response_datetime( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1508,7 +1508,7 @@ def param_datetime_rfc1123( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1557,7 +1557,7 @@ def response_datetime_rfc1123( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1608,7 +1608,7 @@ def param_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1655,7 +1655,7 @@ def response_duration( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1706,7 +1706,7 @@ def param_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1751,7 +1751,7 @@ def response_byte(self, *, scenario: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1805,7 +1805,7 @@ def param_enum( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1851,7 +1851,7 @@ def response_enum(self, *, scenario: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1897,7 +1897,7 @@ def custom_request_id(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/aio/operations/_operations.py index 7f7f58ba6f7..75f17bece8b 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar, cast +from typing import Any, Callable, Literal, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -140,7 +140,7 @@ from .._configuration import AutoRestHttpInfrastructureTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] @@ -177,7 +177,7 @@ async def get_empty_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -225,7 +225,7 @@ async def get_no_model_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -273,7 +273,7 @@ async def get_no_model_empty(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -341,7 +341,7 @@ async def head200(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -382,7 +382,7 @@ async def get200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -430,7 +430,7 @@ async def options200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -481,7 +481,7 @@ async def put200(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -533,7 +533,7 @@ async def patch200(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -585,7 +585,7 @@ async def post200(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -637,7 +637,7 @@ async def delete200(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -689,7 +689,7 @@ async def put201(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -741,7 +741,7 @@ async def post201(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -793,7 +793,7 @@ async def put202(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -845,7 +845,7 @@ async def patch202(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -897,7 +897,7 @@ async def post202(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -949,7 +949,7 @@ async def delete202(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -998,7 +998,7 @@ async def head204(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1042,7 +1042,7 @@ async def put204(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1094,7 +1094,7 @@ async def patch204(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1146,7 +1146,7 @@ async def post204(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1198,7 +1198,7 @@ async def delete204(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1247,7 +1247,7 @@ async def head404(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1308,7 +1308,7 @@ async def head300(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1340,7 +1340,7 @@ async def head300(self, **kwargs: Any) -> None: return cls(pipeline_response, None, response_headers) # type: ignore @distributed_trace_async - async def get300(self, **kwargs: Any) -> Optional[List[str]]: + async def get300(self, **kwargs: Any) -> Optional[list[str]]: """Return 300 status code and redirect to /http/success/200. :return: list of str or None @@ -1361,12 +1361,12 @@ async def get300(self, **kwargs: Any) -> Optional[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[list[str]]] = kwargs.pop("cls", None) _request = build_http_redirects_get300_request( headers=_headers, @@ -1414,7 +1414,7 @@ async def head301(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1459,7 +1459,7 @@ async def get301(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1508,7 +1508,7 @@ async def put301(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1560,7 +1560,7 @@ async def head302(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1605,7 +1605,7 @@ async def get302(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1654,7 +1654,7 @@ async def patch302(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1710,7 +1710,7 @@ async def post303(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1763,7 +1763,7 @@ async def head307(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1808,7 +1808,7 @@ async def get307(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1853,7 +1853,7 @@ async def options307(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1901,7 +1901,7 @@ async def put307(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1957,7 +1957,7 @@ async def patch307(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2013,7 +2013,7 @@ async def post307(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2069,7 +2069,7 @@ async def delete307(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2142,7 +2142,7 @@ async def head400(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2183,7 +2183,7 @@ async def get400(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2224,7 +2224,7 @@ async def options400(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2268,7 +2268,7 @@ async def put400(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2320,7 +2320,7 @@ async def patch400(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2372,7 +2372,7 @@ async def post400(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2424,7 +2424,7 @@ async def delete400(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2473,7 +2473,7 @@ async def head401(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2514,7 +2514,7 @@ async def get402(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2555,7 +2555,7 @@ async def options403(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2596,7 +2596,7 @@ async def get403(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2640,7 +2640,7 @@ async def put404(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2692,7 +2692,7 @@ async def patch405(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2744,7 +2744,7 @@ async def post406(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2796,7 +2796,7 @@ async def delete407(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2848,7 +2848,7 @@ async def put409(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2897,7 +2897,7 @@ async def head410(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2938,7 +2938,7 @@ async def get411(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2979,7 +2979,7 @@ async def options412(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3020,7 +3020,7 @@ async def get412(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3064,7 +3064,7 @@ async def put413(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3116,7 +3116,7 @@ async def patch414(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3168,7 +3168,7 @@ async def post415(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3217,7 +3217,7 @@ async def get416(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3261,7 +3261,7 @@ async def delete417(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3310,7 +3310,7 @@ async def head429(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3371,7 +3371,7 @@ async def head501(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3412,7 +3412,7 @@ async def get501(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3456,7 +3456,7 @@ async def post505(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3508,7 +3508,7 @@ async def delete505(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3577,7 +3577,7 @@ async def head408(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3621,7 +3621,7 @@ async def put500(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3673,7 +3673,7 @@ async def patch500(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3722,7 +3722,7 @@ async def get502(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3763,7 +3763,7 @@ async def options502(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3814,7 +3814,7 @@ async def post503(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3866,7 +3866,7 @@ async def delete503(self, boolean_value: Optional[Literal[True]] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3918,7 +3918,7 @@ async def put504(self, boolean_value: Optional[Literal[True]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3970,7 +3970,7 @@ async def patch504(self, boolean_value: Optional[Literal[True]] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4049,7 +4049,7 @@ async def get200_model204_no_model_default_error200_valid( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4109,7 +4109,7 @@ async def get200_model204_no_model_default_error204_valid( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4169,7 +4169,7 @@ async def get200_model204_no_model_default_error201_invalid( # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4229,7 +4229,7 @@ async def get200_model204_no_model_default_error202_none( # pylint: disable=nam 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4289,7 +4289,7 @@ async def get200_model204_no_model_default_error400_valid( # pylint: disable=na 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4354,7 +4354,7 @@ async def get200_model201_model_default_error200_valid( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4417,7 +4417,7 @@ async def get200_model201_model_default_error201_valid( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4480,7 +4480,7 @@ async def get200_model201_model_default_error400_valid( # pylint: disable=name- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4546,7 +4546,7 @@ async def get200_model_a201_model_c404_model_d_default_error200_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4612,7 +4612,7 @@ async def get200_model_a201_model_c404_model_d_default_error201_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4678,7 +4678,7 @@ async def get200_model_a201_model_c404_model_d_default_error404_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4744,7 +4744,7 @@ async def get200_model_a201_model_c404_model_d_default_error400_valid( # pylint 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4792,7 +4792,7 @@ async def get202_none204_none_default_error202_none(self, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4833,7 +4833,7 @@ async def get202_none204_none_default_error204_none(self, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4874,7 +4874,7 @@ async def get202_none204_none_default_error400_valid(self, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4915,7 +4915,7 @@ async def get202_none204_none_default_none202_invalid(self, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4956,7 +4956,7 @@ async def get202_none204_none_default_none204_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4997,7 +4997,7 @@ async def get202_none204_none_default_none400_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5038,7 +5038,7 @@ async def get202_none204_none_default_none400_invalid(self, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5087,7 +5087,7 @@ async def get_default_model_a200_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5143,7 +5143,7 @@ async def get_default_model_a200_none(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5191,7 +5191,7 @@ async def get_default_model_a400_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5232,7 +5232,7 @@ async def get_default_model_a400_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5273,7 +5273,7 @@ async def get_default_none200_invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5314,7 +5314,7 @@ async def get_default_none200_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5355,7 +5355,7 @@ async def get_default_none400_invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5396,7 +5396,7 @@ async def get_default_none400_none(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5446,7 +5446,7 @@ async def get200_model_a200_none(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5502,7 +5502,7 @@ async def get200_model_a200_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5558,7 +5558,7 @@ async def get200_model_a200_invalid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5614,7 +5614,7 @@ async def get200_model_a400_none(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5670,7 +5670,7 @@ async def get200_model_a400_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5726,7 +5726,7 @@ async def get200_model_a400_invalid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5782,7 +5782,7 @@ async def get200_model_a202_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/operations/_operations.py index e8dc3c3bb13..9afc8f52e87 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/HttpVersionTolerant/httpinfrastructureversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar, cast +from typing import Any, Callable, Literal, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] _SERIALIZER = Serializer() @@ -1781,7 +1781,7 @@ def get_empty_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1829,7 +1829,7 @@ def get_no_model_error(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1877,7 +1877,7 @@ def get_no_model_empty(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1945,7 +1945,7 @@ def head200(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1986,7 +1986,7 @@ def get200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2034,7 +2034,7 @@ def options200(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2087,7 +2087,7 @@ def put200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2141,7 +2141,7 @@ def patch200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2195,7 +2195,7 @@ def post200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2249,7 +2249,7 @@ def delete200( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2303,7 +2303,7 @@ def put201( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2357,7 +2357,7 @@ def post201( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2411,7 +2411,7 @@ def put202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2465,7 +2465,7 @@ def patch202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2519,7 +2519,7 @@ def post202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2573,7 +2573,7 @@ def delete202( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2622,7 +2622,7 @@ def head204(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2668,7 +2668,7 @@ def put204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2722,7 +2722,7 @@ def patch204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2776,7 +2776,7 @@ def post204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2830,7 +2830,7 @@ def delete204( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2879,7 +2879,7 @@ def head404(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2940,7 +2940,7 @@ def head300(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2972,7 +2972,7 @@ def head300(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return return cls(pipeline_response, None, response_headers) # type: ignore @distributed_trace - def get300(self, **kwargs: Any) -> Optional[List[str]]: + def get300(self, **kwargs: Any) -> Optional[list[str]]: """Return 300 status code and redirect to /http/success/200. :return: list of str or None @@ -2993,12 +2993,12 @@ def get300(self, **kwargs: Any) -> Optional[List[str]]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Optional[List[str]]] = kwargs.pop("cls", None) + cls: ClsType[Optional[list[str]]] = kwargs.pop("cls", None) _request = build_http_redirects_get300_request( headers=_headers, @@ -3046,7 +3046,7 @@ def head301(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3091,7 +3091,7 @@ def get301(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3142,7 +3142,7 @@ def put301( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3194,7 +3194,7 @@ def head302(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3239,7 +3239,7 @@ def get302(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3290,7 +3290,7 @@ def patch302( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3348,7 +3348,7 @@ def post303( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3401,7 +3401,7 @@ def head307(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3446,7 +3446,7 @@ def get307(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3491,7 +3491,7 @@ def options307(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3541,7 +3541,7 @@ def put307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3599,7 +3599,7 @@ def patch307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3657,7 +3657,7 @@ def post307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3715,7 +3715,7 @@ def delete307( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3788,7 +3788,7 @@ def head400(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3829,7 +3829,7 @@ def get400(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3870,7 +3870,7 @@ def options400(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3916,7 +3916,7 @@ def put400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3970,7 +3970,7 @@ def patch400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4024,7 +4024,7 @@ def post400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4078,7 +4078,7 @@ def delete400( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4127,7 +4127,7 @@ def head401(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4168,7 +4168,7 @@ def get402(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4209,7 +4209,7 @@ def options403(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4250,7 +4250,7 @@ def get403(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4296,7 +4296,7 @@ def put404( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4350,7 +4350,7 @@ def patch405( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4404,7 +4404,7 @@ def post406( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4458,7 +4458,7 @@ def delete407( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4512,7 +4512,7 @@ def put409( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4561,7 +4561,7 @@ def head410(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4602,7 +4602,7 @@ def get411(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4643,7 +4643,7 @@ def options412(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4684,7 +4684,7 @@ def get412(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4730,7 +4730,7 @@ def put413( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4784,7 +4784,7 @@ def patch414( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4838,7 +4838,7 @@ def post415( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4887,7 +4887,7 @@ def get416(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4933,7 +4933,7 @@ def delete417( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4982,7 +4982,7 @@ def head429(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5043,7 +5043,7 @@ def head501(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5084,7 +5084,7 @@ def get501(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5130,7 +5130,7 @@ def post505( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5184,7 +5184,7 @@ def delete505( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5253,7 +5253,7 @@ def head408(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5299,7 +5299,7 @@ def put500( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5353,7 +5353,7 @@ def patch500( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5402,7 +5402,7 @@ def get502(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5443,7 +5443,7 @@ def options502(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5496,7 +5496,7 @@ def post503( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5550,7 +5550,7 @@ def delete503( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5604,7 +5604,7 @@ def put504( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5658,7 +5658,7 @@ def patch504( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -5737,7 +5737,7 @@ def get200_model204_no_model_default_error200_valid( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5797,7 +5797,7 @@ def get200_model204_no_model_default_error204_valid( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5857,7 +5857,7 @@ def get200_model204_no_model_default_error201_invalid( # pylint: disable=name-t 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5917,7 +5917,7 @@ def get200_model204_no_model_default_error202_none( # pylint: disable=name-too- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5977,7 +5977,7 @@ def get200_model204_no_model_default_error400_valid( # pylint: disable=name-too 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6040,7 +6040,7 @@ def get200_model201_model_default_error200_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6101,7 +6101,7 @@ def get200_model201_model_default_error201_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6162,7 +6162,7 @@ def get200_model201_model_default_error400_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6228,7 +6228,7 @@ def get200_model_a201_model_c404_model_d_default_error200_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6294,7 +6294,7 @@ def get200_model_a201_model_c404_model_d_default_error201_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6360,7 +6360,7 @@ def get200_model_a201_model_c404_model_d_default_error404_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6426,7 +6426,7 @@ def get200_model_a201_model_c404_model_d_default_error400_valid( # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6476,7 +6476,7 @@ def get202_none204_none_default_error202_none( # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6519,7 +6519,7 @@ def get202_none204_none_default_error204_none( # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6562,7 +6562,7 @@ def get202_none204_none_default_error400_valid( # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6605,7 +6605,7 @@ def get202_none204_none_default_none202_invalid( # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6648,7 +6648,7 @@ def get202_none204_none_default_none204_none( # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6691,7 +6691,7 @@ def get202_none204_none_default_none400_none( # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6734,7 +6734,7 @@ def get202_none204_none_default_none400_invalid( # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6783,7 +6783,7 @@ def get_default_model_a200_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6839,7 +6839,7 @@ def get_default_model_a200_none(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6887,7 +6887,7 @@ def get_default_model_a400_valid(self, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6928,7 +6928,7 @@ def get_default_model_a400_none(self, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6969,7 +6969,7 @@ def get_default_none200_invalid(self, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7010,7 +7010,7 @@ def get_default_none200_none(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7051,7 +7051,7 @@ def get_default_none400_invalid(self, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7092,7 +7092,7 @@ def get_default_none400_none(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7142,7 +7142,7 @@ def get200_model_a200_none(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7198,7 +7198,7 @@ def get200_model_a200_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7254,7 +7254,7 @@ def get200_model_a200_invalid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7310,7 +7310,7 @@ def get200_model_a400_none(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7366,7 +7366,7 @@ def get200_model_a400_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7422,7 +7422,7 @@ def get200_model_a400_invalid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7478,7 +7478,7 @@ def get200_model_a202_valid(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_operations/_operations.py index 79e98de9b59..84b2e568bb8 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -60,7 +60,7 @@ def get_incorrect_error_from_server(self, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_operations/_operations.py index 759c4eb89b3..d83604d5d48 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/IncorrectErrorResponseVersionTolerant/incorrecterrorresponseversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import IncorrectReturnedErrorModelConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _IncorrectReturnedErrorModelOperationsMixin( @@ -49,7 +49,7 @@ async def get_incorrect_error_from_server(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_operations/_operations.py index 7b56185938a..21a371d6fcc 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -220,7 +220,7 @@ def analyze_body(self, input: Optional[Union[JSON, IO[bytes]]] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -345,7 +345,7 @@ def analyze_body_no_accept_header( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -408,7 +408,7 @@ def content_type_with_encoding(self, input: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -467,7 +467,7 @@ def binary_body_with_two_content_types(self, message: IO[bytes], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -524,7 +524,7 @@ def binary_body_with_three_content_types(self, message: IO[bytes], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -579,7 +579,7 @@ def put_text_and_json_body(self, message: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_operations/_operations.py index a35a45cd205..4f2e58aabf8 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MediaTypesVersionTolerant/mediatypesversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -37,7 +37,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MediaTypesClientOperationsMixin( # pylint: disable=abstract-class-instantiated @@ -116,7 +116,7 @@ async def analyze_body(self, input: Optional[Union[JSON, IO[bytes]]] = None, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -241,7 +241,7 @@ async def analyze_body_no_accept_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -304,7 +304,7 @@ async def content_type_with_encoding(self, input: Optional[str] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -363,7 +363,7 @@ async def binary_body_with_two_content_types(self, message: IO[bytes], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -420,7 +420,7 @@ async def binary_body_with_three_content_types(self, message: IO[bytes], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -475,7 +475,7 @@ async def put_text_and_json_body(self, message: str, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_operations/_operations.py index 1da0dd33cfa..ee37bfad7cf 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -73,7 +73,7 @@ def patch_single(self, body: JSON, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_operations/_operations.py index 030fbb967de..88ebda7a734 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MergePatchJsonVersionTolerant/mergepatchjsonversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MergePatchJsonClientOperationsMixin( @@ -52,7 +52,7 @@ async def patch_single(self, body: JSON, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_operations/_operations.py index 276bb710ae0..2c1c21eecc2 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -244,7 +244,7 @@ class _AutoRestResourceFlatteningTestServiceOperationsMixin( @overload def put_array( - self, resource_array: Optional[List[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any + self, resource_array: Optional[list[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put External Resource as an Array. @@ -298,7 +298,7 @@ def put_array( @distributed_trace def put_array( # pylint: disable=inconsistent-return-statements - self, resource_array: Optional[Union[List[JSON], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[JSON], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as an Array. @@ -318,7 +318,7 @@ def put_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -361,7 +361,7 @@ def put_array( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_array(self, **kwargs: Any) -> List[JSON]: + def get_array(self, **kwargs: Any) -> list[JSON]: """Get External Resource as an Array. .. seealso:: @@ -399,12 +399,12 @@ def get_array(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_auto_rest_resource_flattening_test_service_get_array_request( headers=_headers, @@ -429,13 +429,13 @@ def get_array(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @overload def put_wrapped_array( - self, resource_array: Optional[List[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any + self, resource_array: Optional[list[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -485,7 +485,7 @@ def put_wrapped_array( @distributed_trace def put_wrapped_array( # pylint: disable=inconsistent-return-statements - self, resource_array: Optional[Union[List[JSON], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[JSON], IO[bytes]]] = None, **kwargs: Any ) -> None: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -506,7 +506,7 @@ def put_wrapped_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -549,7 +549,7 @@ def put_wrapped_array( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_wrapped_array(self, **kwargs: Any) -> List[JSON]: + def get_wrapped_array(self, **kwargs: Any) -> list[JSON]: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -578,12 +578,12 @@ def get_wrapped_array(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_auto_rest_resource_flattening_test_service_get_wrapped_array_request( headers=_headers, @@ -608,14 +608,14 @@ def get_wrapped_array(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @overload def put_dictionary( self, - resource_dictionary: Optional[Dict[str, JSON]] = None, + resource_dictionary: Optional[dict[str, JSON]] = None, *, content_type: str = "application/json", **kwargs: Any, @@ -678,7 +678,7 @@ def put_dictionary( @distributed_trace def put_dictionary( # pylint: disable=inconsistent-return-statements - self, resource_dictionary: Optional[Union[Dict[str, JSON], IO[bytes]]] = None, **kwargs: Any + self, resource_dictionary: Optional[Union[dict[str, JSON], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as a Dictionary. @@ -698,7 +698,7 @@ def put_dictionary( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -741,7 +741,7 @@ def put_dictionary( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_dictionary(self, **kwargs: Any) -> Dict[str, JSON]: + def get_dictionary(self, **kwargs: Any) -> dict[str, JSON]: """Get External Resource as a Dictionary. .. seealso:: @@ -779,12 +779,12 @@ def get_dictionary(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_auto_rest_resource_flattening_test_service_get_dictionary_request( headers=_headers, @@ -809,9 +809,9 @@ def get_dictionary(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @overload def put_resource_collection( @@ -991,7 +991,7 @@ def put_resource_collection( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1106,7 +1106,7 @@ def get_resource_collection(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1277,7 +1277,7 @@ def put_simple_product(self, simple_body_product: Optional[Union[JSON, IO[bytes] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1465,7 +1465,7 @@ def post_flattened_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1669,7 +1669,7 @@ def put_simple_product_with_grouping( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_operations/_operations.py index 5b53ad49c43..4d756d899c3 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ModelFlatteningVersionTolerant/modelflatteningversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -42,7 +42,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestResourceFlatteningTestServiceOperationsMixin( @@ -53,7 +53,7 @@ class _AutoRestResourceFlatteningTestServiceOperationsMixin( @overload async def put_array( - self, resource_array: Optional[List[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any + self, resource_array: Optional[list[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """Put External Resource as an Array. @@ -106,7 +106,7 @@ async def put_array( """ @distributed_trace_async - async def put_array(self, resource_array: Optional[Union[List[JSON], IO[bytes]]] = None, **kwargs: Any) -> None: + async def put_array(self, resource_array: Optional[Union[list[JSON], IO[bytes]]] = None, **kwargs: Any) -> None: """Put External Resource as an Array. .. seealso:: @@ -125,7 +125,7 @@ async def put_array(self, resource_array: Optional[Union[List[JSON], IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ async def put_array(self, resource_array: Optional[Union[List[JSON], IO[bytes]]] return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_array(self, **kwargs: Any) -> List[JSON]: + async def get_array(self, **kwargs: Any) -> list[JSON]: """Get External Resource as an Array. .. seealso:: @@ -206,12 +206,12 @@ async def get_array(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_auto_rest_resource_flattening_test_service_get_array_request( headers=_headers, @@ -236,13 +236,13 @@ async def get_array(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @overload async def put_wrapped_array( - self, resource_array: Optional[List[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any + self, resource_array: Optional[list[JSON]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -292,7 +292,7 @@ async def put_wrapped_array( @distributed_trace_async async def put_wrapped_array( - self, resource_array: Optional[Union[List[JSON], IO[bytes]]] = None, **kwargs: Any + self, resource_array: Optional[Union[list[JSON], IO[bytes]]] = None, **kwargs: Any ) -> None: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -313,7 +313,7 @@ async def put_wrapped_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -356,7 +356,7 @@ async def put_wrapped_array( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_wrapped_array(self, **kwargs: Any) -> List[JSON]: + async def get_wrapped_array(self, **kwargs: Any) -> list[JSON]: """No need to have a route in Express server for this operation. Used to verify the type flattened is not removed if it's referenced in an array. @@ -385,12 +385,12 @@ async def get_wrapped_array(self, **kwargs: Any) -> List[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[JSON]] = kwargs.pop("cls", None) + cls: ClsType[list[JSON]] = kwargs.pop("cls", None) _request = build_auto_rest_resource_flattening_test_service_get_wrapped_array_request( headers=_headers, @@ -415,14 +415,14 @@ async def get_wrapped_array(self, **kwargs: Any) -> List[JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(List[JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(list[JSON], deserialized), {}) # type: ignore - return cast(List[JSON], deserialized) # type: ignore + return cast(list[JSON], deserialized) # type: ignore @overload async def put_dictionary( self, - resource_dictionary: Optional[Dict[str, JSON]] = None, + resource_dictionary: Optional[dict[str, JSON]] = None, *, content_type: str = "application/json", **kwargs: Any @@ -485,7 +485,7 @@ async def put_dictionary( @distributed_trace_async async def put_dictionary( - self, resource_dictionary: Optional[Union[Dict[str, JSON], IO[bytes]]] = None, **kwargs: Any + self, resource_dictionary: Optional[Union[dict[str, JSON], IO[bytes]]] = None, **kwargs: Any ) -> None: """Put External Resource as a Dictionary. @@ -505,7 +505,7 @@ async def put_dictionary( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -548,7 +548,7 @@ async def put_dictionary( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_dictionary(self, **kwargs: Any) -> Dict[str, JSON]: + async def get_dictionary(self, **kwargs: Any) -> dict[str, JSON]: """Get External Resource as a Dictionary. .. seealso:: @@ -586,12 +586,12 @@ async def get_dictionary(self, **kwargs: Any) -> Dict[str, JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, JSON]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, JSON]] = kwargs.pop("cls", None) _request = build_auto_rest_resource_flattening_test_service_get_dictionary_request( headers=_headers, @@ -616,9 +616,9 @@ async def get_dictionary(self, **kwargs: Any) -> Dict[str, JSON]: deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, JSON], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, JSON], deserialized), {}) # type: ignore - return cast(Dict[str, JSON], deserialized) # type: ignore + return cast(dict[str, JSON], deserialized) # type: ignore @overload async def put_resource_collection( @@ -798,7 +798,7 @@ async def put_resource_collection( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -913,7 +913,7 @@ async def get_resource_collection(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1086,7 +1086,7 @@ async def put_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1274,7 +1274,7 @@ async def post_flattened_simple_product( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1478,7 +1478,7 @@ async def put_simple_product_with_grouping( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_operations/_operations.py index 357a2f396be..91de1e370f9 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -226,7 +226,7 @@ def get_horse(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -323,7 +323,7 @@ def put_horse(self, horse: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -391,7 +391,7 @@ def get_pet(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -485,7 +485,7 @@ def put_pet(self, pet: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -554,7 +554,7 @@ def get_feline(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -651,7 +651,7 @@ def put_feline(self, feline: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -722,7 +722,7 @@ def get_cat(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -825,7 +825,7 @@ def put_cat(self, cat: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -898,7 +898,7 @@ def get_kitten(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1006,7 +1006,7 @@ def put_kitten(self, kitten: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_operations/_operations.py index c74aa62edbb..25031c3f11e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/MultipleInheritanceVersionTolerant/multipleinheritanceversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -41,7 +41,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _MultipleInheritanceServiceClientOperationsMixin( @@ -71,7 +71,7 @@ async def get_horse(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -168,7 +168,7 @@ async def put_horse(self, horse: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -236,7 +236,7 @@ async def get_pet(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ async def put_pet(self, pet: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -399,7 +399,7 @@ async def get_feline(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -496,7 +496,7 @@ async def put_feline(self, feline: Union[JSON, IO[bytes]], **kwargs: Any) -> str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -567,7 +567,7 @@ async def get_cat(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -670,7 +670,7 @@ async def put_cat(self, cat: Union[JSON, IO[bytes]], **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -743,7 +743,7 @@ async def get_kitten(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -851,7 +851,7 @@ async def put_kitten(self, kitten: Union[JSON, IO[bytes]], **kwargs: Any) -> str 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_operations/_operations.py index 24311a83df6..1180d9dd7fd 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -136,7 +136,7 @@ def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -187,7 +187,7 @@ def put_object(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -284,7 +284,7 @@ def put_string(self, input: Any, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -381,7 +381,7 @@ def put_array(self, input: Any, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/aio/_operations/_operations.py index 008e2b69625..a8fa7d5bad0 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoNamespaceFlagVersionTolerant/anything_client/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from .._configuration import AnythingClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AnythingClientOperationsMixin( @@ -57,7 +57,7 @@ async def get_object(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -108,7 +108,7 @@ async def put_object(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -154,7 +154,7 @@ async def get_string(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -205,7 +205,7 @@ async def put_string(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -251,7 +251,7 @@ async def get_array(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -302,7 +302,7 @@ async def put_array(self, input: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoOperationsVersionTolerant/nooperationsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoOperationsVersionTolerant/nooperationsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoOperationsVersionTolerant/nooperationsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NoOperationsVersionTolerant/nooperationsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/aio/operations/_operations.py index 0aefa6f3bb2..445211ee32b 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._configuration import NonStringEnumsClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class IntOperations: @@ -69,7 +69,7 @@ async def put(self, input: Optional[int] = None, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -125,7 +125,7 @@ async def get(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -194,7 +194,7 @@ async def put(self, input: Optional[float] = None, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -250,7 +250,7 @@ async def get(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/operations/_operations.py index e656d272cb2..83941dcf6c3 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/NonStringEnumsVersionTolerant/nonstringenumsversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -128,7 +128,7 @@ def put(self, input: Optional[int] = None, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ def get(self, **kwargs: Any) -> int: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -253,7 +253,7 @@ def put(self, input: Optional[float] = None, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -309,7 +309,7 @@ def get(self, **kwargs: Any) -> float: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_operations/_operations.py index af26e4a7d26..87534e168de 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -84,7 +84,7 @@ def get(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -136,7 +136,7 @@ def put(self, put_object: JSON, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_operations/_operations.py index 33d0c90778e..b5bb7ce605c 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ObjectTypeVersionTolerant/objecttypeversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ObjectTypeClientOperationsMixin( @@ -51,7 +51,7 @@ async def get(self, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -103,7 +103,7 @@ async def put(self, put_object: JSON, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/aio/operations/_operations.py index 35e11e60d5d..9b556f04038 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class AvailabilitySetsOperations: @@ -137,7 +137,7 @@ async def update(self, resource_group_name: str, avset: str, tags: Union[JSON, I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/operations/_operations.py index 4b259a6f012..190f396f56f 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterFlatteningVersionTolerant/parameterflatteningversiontolerant/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -161,7 +161,7 @@ def update( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_operations/_operations.py index 282d1d041a8..d9307ecec07 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def get(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-sta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_operations/_operations.py index d3a8062e0a6..51089d371a3 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ParameterizedEndpointVersionTolerant/parameterizedendpointversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import ParmaterizedEndpointClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ParmaterizedEndpointClientOperationsMixin( @@ -48,7 +48,7 @@ async def get(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_operations/_operations.py index 36388d91591..bcea66300da 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -80,7 +80,7 @@ class _AutoRestReportServiceOperationsMixin( ): @distributed_trace - def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :keyword qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' @@ -105,12 +105,12 @@ def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[ 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_auto_rest_report_service_get_report_request( qualifier=qualifier, @@ -136,12 +136,12 @@ def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[ deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace - def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get optional test coverage report. :keyword qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' @@ -166,12 +166,12 @@ def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_auto_rest_report_service_get_optional_report_request( qualifier=qualifier, @@ -197,6 +197,6 @@ def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_operations/_operations.py index fd4ae84eb10..ee070f3b336 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReportVersionTolerant/reportversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import AutoRestReportServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestReportServiceOperationsMixin( @@ -38,7 +38,7 @@ class _AutoRestReportServiceOperationsMixin( ): @distributed_trace_async - async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get test coverage report. :keyword qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' @@ -63,12 +63,12 @@ async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_auto_rest_report_service_get_report_request( qualifier=qualifier, @@ -94,12 +94,12 @@ async def get_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore @distributed_trace_async - async def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> Dict[str, int]: + async def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs: Any) -> dict[str, int]: """Get optional test coverage report. :keyword qualifier: If specified, qualifies the generated report further (e.g. '2.7' vs '3.5' @@ -124,12 +124,12 @@ async def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_auto_rest_report_service_get_optional_report_request( qualifier=qualifier, @@ -155,6 +155,6 @@ async def get_optional_report(self, *, qualifier: Optional[str] = None, **kwargs deserialized = None if cls: - return cls(pipeline_response, cast(Dict[str, int], deserialized), {}) # type: ignore + return cls(pipeline_response, cast(dict[str, int], deserialized), {}) # type: ignore - return cast(Dict[str, int], deserialized) # type: ignore + return cast(dict[str, int], deserialized) # type: ignore diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/aio/operations/_operations.py index decb4f3df69..3a69edb7f3a 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -62,7 +62,7 @@ from .._configuration import AutoRestRequiredOptionalTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] @@ -101,7 +101,7 @@ async def get_required_path(self, path_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def put_optional_query(self, *, query_parameter: Optional[str] = None, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -189,7 +189,7 @@ async def put_optional_header(self, *, query_parameter: Optional[str] = None, ** 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ async def put_optional_body(self, body_parameter: Optional[str] = None, **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -284,7 +284,7 @@ async def put_optional_binary_body(self, body_parameter: Optional[IO[bytes]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -330,7 +330,7 @@ async def get_required_global_path(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -372,7 +372,7 @@ async def get_required_global_query(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -414,7 +414,7 @@ async def get_optional_global_query(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -478,7 +478,7 @@ async def put_optional_binary_body(self, body_parameter: Optional[IO[bytes]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -526,7 +526,7 @@ async def put_required_binary_body(self, body_parameter: IO[bytes], **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -575,7 +575,7 @@ async def post_required_integer_parameter(self, body_parameter: int, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -623,7 +623,7 @@ async def post_optional_integer_parameter(self, body_parameter: Optional[int] = 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -725,7 +725,7 @@ async def post_required_integer_property(self, body_parameter: Union[JSON, IO[by 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -830,7 +830,7 @@ async def post_optional_integer_property( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -889,7 +889,7 @@ async def post_required_integer_header(self, *, header_parameter: int, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -933,7 +933,7 @@ async def post_optional_integer_header(self, *, header_parameter: Optional[int] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -978,7 +978,7 @@ async def post_required_string_parameter(self, body_parameter: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1026,7 +1026,7 @@ async def post_optional_string_parameter(self, body_parameter: Optional[str] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1128,7 +1128,7 @@ async def post_required_string_property(self, body_parameter: Union[JSON, IO[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1233,7 +1233,7 @@ async def post_optional_string_property( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1292,7 +1292,7 @@ async def post_required_string_header(self, *, header_parameter: str, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1336,7 +1336,7 @@ async def post_optional_string_header(self, *, body_parameter: Optional[str] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1433,7 +1433,7 @@ async def post_required_class_parameter(self, body_parameter: Union[JSON, IO[byt 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1540,7 +1540,7 @@ async def post_optional_class_parameter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1655,7 +1655,7 @@ async def post_required_class_property(self, body_parameter: Union[JSON, IO[byte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1766,7 +1766,7 @@ async def post_optional_class_property( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1810,7 +1810,7 @@ async def post_optional_class_property( @overload async def post_required_array_parameter( - self, body_parameter: List[str], *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -1851,7 +1851,7 @@ async def post_required_array_parameter( """ @distributed_trace_async - async def post_required_array_parameter(self, body_parameter: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def post_required_array_parameter(self, body_parameter: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -1867,7 +1867,7 @@ async def post_required_array_parameter(self, body_parameter: Union[List[str], I 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1908,7 +1908,7 @@ async def post_required_array_parameter(self, body_parameter: Union[List[str], I @overload async def post_optional_array_parameter( - self, body_parameter: Optional[List[str]] = None, *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: Optional[list[str]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -1948,7 +1948,7 @@ async def post_optional_array_parameter( @distributed_trace_async async def post_optional_array_parameter( - self, body_parameter: Optional[Union[List[str], IO[bytes]]] = None, **kwargs: Any + self, body_parameter: Optional[Union[list[str], IO[bytes]]] = None, **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -1964,7 +1964,7 @@ async def post_optional_array_parameter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2077,7 +2077,7 @@ async def post_required_array_property(self, body_parameter: Union[JSON, IO[byte 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2186,7 +2186,7 @@ async def post_optional_array_property( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2229,7 +2229,7 @@ async def post_optional_array_property( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def post_required_array_header(self, *, header_parameter: List[str], **kwargs: Any) -> None: + async def post_required_array_header(self, *, header_parameter: list[str], **kwargs: Any) -> None: """Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent. @@ -2245,7 +2245,7 @@ async def post_required_array_header(self, *, header_parameter: List[str], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2274,7 +2274,7 @@ async def post_required_array_header(self, *, header_parameter: List[str], **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def post_optional_array_header(self, *, header_parameter: Optional[List[str]] = None, **kwargs: Any) -> None: + async def post_optional_array_header(self, *, header_parameter: Optional[list[str]] = None, **kwargs: Any) -> None: """Test explicitly optional integer. Please put a header 'headerParameter' => null. :keyword header_parameter: Default value is None. @@ -2289,7 +2289,7 @@ async def post_optional_array_header(self, *, header_parameter: Optional[List[st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/operations/_operations.py index 66ed3a63cfe..e5e91abf7ac 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/RequiredOptionalVersionTolerant/requiredoptionalversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] _SERIALIZER = Serializer() @@ -584,7 +584,7 @@ def build_explicit_post_optional_array_property_request(**kwargs: Any) -> HttpRe def build_explicit_post_required_array_header_request( # pylint: disable=name-too-long - *, header_parameter: List[str], **kwargs: Any + *, header_parameter: list[str], **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -601,7 +601,7 @@ def build_explicit_post_required_array_header_request( # pylint: disable=name-t def build_explicit_post_optional_array_header_request( # pylint: disable=name-too-long - *, header_parameter: Optional[List[str]] = None, **kwargs: Any + *, header_parameter: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -655,7 +655,7 @@ def get_required_path( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -701,7 +701,7 @@ def put_optional_query( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -747,7 +747,7 @@ def put_optional_header( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -793,7 +793,7 @@ def put_optional_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -846,7 +846,7 @@ def put_optional_binary_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -892,7 +892,7 @@ def get_required_global_path(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -934,7 +934,7 @@ def get_required_global_query(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -976,7 +976,7 @@ def get_optional_global_query(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1042,7 +1042,7 @@ def put_optional_binary_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1092,7 +1092,7 @@ def put_required_binary_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1143,7 +1143,7 @@ def post_required_integer_parameter( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1193,7 +1193,7 @@ def post_optional_integer_parameter( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1297,7 +1297,7 @@ def post_required_integer_property( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1402,7 +1402,7 @@ def post_optional_integer_property( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1463,7 +1463,7 @@ def post_required_integer_header( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1509,7 +1509,7 @@ def post_optional_integer_header( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1556,7 +1556,7 @@ def post_required_string_parameter( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1606,7 +1606,7 @@ def post_optional_string_parameter( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1710,7 +1710,7 @@ def post_required_string_property( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1815,7 +1815,7 @@ def post_optional_string_property( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1876,7 +1876,7 @@ def post_required_string_header( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1922,7 +1922,7 @@ def post_optional_string_header( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2021,7 +2021,7 @@ def post_required_class_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2128,7 +2128,7 @@ def post_optional_class_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2245,7 +2245,7 @@ def post_required_class_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2356,7 +2356,7 @@ def post_optional_class_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2400,7 +2400,7 @@ def post_optional_class_property( # pylint: disable=inconsistent-return-stateme @overload def post_required_array_parameter( - self, body_parameter: List[str], *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: list[str], *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -2442,7 +2442,7 @@ def post_required_array_parameter( @distributed_trace def post_required_array_parameter( # pylint: disable=inconsistent-return-statements - self, body_parameter: Union[List[str], IO[bytes]], **kwargs: Any + self, body_parameter: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """Test explicitly required array. Please put null and the client library should throw before the request is sent. @@ -2459,7 +2459,7 @@ def post_required_array_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2500,7 +2500,7 @@ def post_required_array_parameter( # pylint: disable=inconsistent-return-statem @overload def post_optional_array_parameter( - self, body_parameter: Optional[List[str]] = None, *, content_type: str = "application/json", **kwargs: Any + self, body_parameter: Optional[list[str]] = None, *, content_type: str = "application/json", **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -2540,7 +2540,7 @@ def post_optional_array_parameter( @distributed_trace def post_optional_array_parameter( # pylint: disable=inconsistent-return-statements - self, body_parameter: Optional[Union[List[str], IO[bytes]]] = None, **kwargs: Any + self, body_parameter: Optional[Union[list[str], IO[bytes]]] = None, **kwargs: Any ) -> None: """Test explicitly optional array. Please put null. @@ -2556,7 +2556,7 @@ def post_optional_array_parameter( # pylint: disable=inconsistent-return-statem 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2671,7 +2671,7 @@ def post_required_array_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2780,7 +2780,7 @@ def post_optional_array_property( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2824,7 +2824,7 @@ def post_optional_array_property( # pylint: disable=inconsistent-return-stateme @distributed_trace def post_required_array_header( # pylint: disable=inconsistent-return-statements - self, *, header_parameter: List[str], **kwargs: Any + self, *, header_parameter: list[str], **kwargs: Any ) -> None: """Test explicitly required array. Please put a header 'headerParameter' => null and the client library should throw before the request is sent. @@ -2841,7 +2841,7 @@ def post_required_array_header( # pylint: disable=inconsistent-return-statement 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2871,7 +2871,7 @@ def post_required_array_header( # pylint: disable=inconsistent-return-statement @distributed_trace def post_optional_array_header( # pylint: disable=inconsistent-return-statements - self, *, header_parameter: Optional[List[str]] = None, **kwargs: Any + self, *, header_parameter: Optional[list[str]] = None, **kwargs: Any ) -> None: """Test explicitly optional integer. Please put a header 'headerParameter' => null. @@ -2887,7 +2887,7 @@ def post_optional_array_header( # pylint: disable=inconsistent-return-statement 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/operations/_operations.py index 2801f4be183..5de05cdc001 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, cast +from typing import Any, Callable, IO, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ImportOperations: @@ -72,7 +72,7 @@ async def operation_one(self, *, parameter1: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -137,7 +137,7 @@ async def operation_with_content_param(self, content: IO[bytes], **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -192,7 +192,7 @@ async def operation_with_json_param(self, json: Any, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ async def operation_with_json_param(self, json: Any, **kwargs: Any) -> JSON: @distributed_trace_async async def operation_with_url( - self, url: str, *, header_parameters: str, query_parameters: Optional[List[str]] = None, **kwargs: Any + self, url: str, *, header_parameters: str, query_parameters: Optional[list[str]] = None, **kwargs: Any ) -> JSON: """Operation with path format argument URL, header param headerParameters, and query param queryParameters. @@ -256,7 +256,7 @@ async def operation_with_url( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ async def reserved_enum(self, *, enum_parameter: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/operations/_operations.py index dec6dd78f53..dc6944f74dc 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ReservedWordsVersionTolerant/reservedwordsversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, cast +from typing import Any, Callable, IO, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -93,7 +93,7 @@ def build_reserved_words_operation_with_json_param_request( # pylint: disable=n def build_reserved_words_operation_with_url_request( # pylint: disable=name-too-long - url: str, *, header_parameters: str, query_parameters: Optional[List[str]] = None, **kwargs: Any + url: str, *, header_parameters: str, query_parameters: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -171,7 +171,7 @@ def operation_one(self, *, parameter1: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -236,7 +236,7 @@ def operation_with_content_param(self, content: IO[bytes], **kwargs: Any) -> JSO 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -291,7 +291,7 @@ def operation_with_json_param(self, json: Any, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -332,7 +332,7 @@ def operation_with_json_param(self, json: Any, **kwargs: Any) -> JSON: @distributed_trace def operation_with_url( - self, url: str, *, header_parameters: str, query_parameters: Optional[List[str]] = None, **kwargs: Any + self, url: str, *, header_parameters: str, query_parameters: Optional[list[str]] = None, **kwargs: Any ) -> JSON: """Operation with path format argument URL, header param headerParameters, and query param queryParameters. @@ -355,7 +355,7 @@ def operation_with_url( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -409,7 +409,7 @@ def reserved_enum(self, *, enum_parameter: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_operations/_operations.py index 37b5a4ce8df..64973f00a8f 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/aio/_operations/_operations.py index ef672aa9bfc..53a7ed6d190 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityAadSwaggerVersionTolerant/securityaadswaggerversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutorestSecurityAadConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutorestSecurityAadOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_operations/_operations.py index 1fe9f880b79..780fb6e8dc9 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -57,7 +57,7 @@ def head(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/aio/_operations/_operations.py index ec6e8cc9ec5..8b97185573c 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/SecurityKeySwaggerVersionTolerant/securitykeyswaggerversiontolerant/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import AutorestSecurityKeyConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutorestSecurityKeyOperationsMixin( @@ -48,7 +48,7 @@ async def head(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/aio/operations/_operations.py index bf0c8f0e541..dfdfec6eac9 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._configuration import AutoRestUrlMutliCollectionFormatTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueriesOperations: @@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def array_string_multi_null(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_multi_null(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get a null array of string using the multi-array format. :keyword array_query: a null array of string using the multi-array format. Default value is @@ -69,7 +69,7 @@ async def array_string_multi_null(self, *, array_query: Optional[List[str]] = No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def array_string_multi_null(self, *, array_query: Optional[List[str]] = No return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_multi_empty(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_multi_empty(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an empty array [] of string using the multi-array format. :keyword array_query: an empty array [] of string using the multi-array format. Default value @@ -114,7 +114,7 @@ async def array_string_multi_empty(self, *, array_query: Optional[List[str]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -143,7 +143,7 @@ async def array_string_multi_empty(self, *, array_query: Optional[List[str]] = N return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_multi_valid(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_multi_valid(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the mult-array format. @@ -160,7 +160,7 @@ async def array_string_multi_valid(self, *, array_query: Optional[List[str]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/operations/_operations.py index 63e5e519df1..6fc2f275b0c 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlMultiCollectionFormatVersionTolerant/urlmulticollectionformatversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,14 +26,14 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False def build_queries_array_string_multi_null_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -56,7 +56,7 @@ def build_queries_array_string_multi_null_request( # pylint: disable=name-too-l def build_queries_array_string_multi_empty_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -79,7 +79,7 @@ def build_queries_array_string_multi_empty_request( # pylint: disable=name-too- def build_queries_array_string_multi_valid_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -122,7 +122,7 @@ def __init__(self, *args, **kwargs) -> None: @distributed_trace def array_string_multi_null( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get a null array of string using the multi-array format. @@ -139,7 +139,7 @@ def array_string_multi_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -169,7 +169,7 @@ def array_string_multi_null( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_multi_empty( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an empty array [] of string using the multi-array format. @@ -186,7 +186,7 @@ def array_string_multi_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -216,7 +216,7 @@ def array_string_multi_empty( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_multi_valid( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the mult-array format. @@ -234,7 +234,7 @@ def array_string_multi_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/aio/operations/_operations.py index 30b93faf84d..bd70ead4c9e 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -96,7 +96,7 @@ from .._configuration import AutoRestUrlTestServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathsOperations: # pylint: disable=too-many-public-methods @@ -130,7 +130,7 @@ async def get_boolean_true(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -173,7 +173,7 @@ async def get_boolean_false(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -216,7 +216,7 @@ async def get_int_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -259,7 +259,7 @@ async def get_int_negative_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -302,7 +302,7 @@ async def get_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -345,7 +345,7 @@ async def get_negative_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -388,7 +388,7 @@ async def float_scientific_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -431,7 +431,7 @@ async def float_scientific_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -474,7 +474,7 @@ async def double_decimal_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -517,7 +517,7 @@ async def double_decimal_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -560,7 +560,7 @@ async def string_unicode(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -603,7 +603,7 @@ async def string_url_encoded(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -648,7 +648,7 @@ async def string_url_non_encoded(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -691,7 +691,7 @@ async def string_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -736,7 +736,7 @@ async def string_null(self, string_path: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -781,7 +781,7 @@ async def enum_valid(self, enum_path: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -826,7 +826,7 @@ async def enum_null(self, enum_path: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -870,7 +870,7 @@ async def byte_multi_byte(self, byte_path: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -912,7 +912,7 @@ async def byte_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -957,7 +957,7 @@ async def byte_null(self, byte_path: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -999,7 +999,7 @@ async def date_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1045,7 +1045,7 @@ async def date_null(self, date_path: datetime.date, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1087,7 +1087,7 @@ async def date_time_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1132,7 +1132,7 @@ async def date_time_null(self, date_time_path: datetime.datetime, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1176,7 +1176,7 @@ async def base64_url(self, base64_url_path: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1205,7 +1205,7 @@ async def base64_url(self, base64_url_path: bytes, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_csv_in_path(self, array_path: List[str], **kwargs: Any) -> None: + async def array_csv_in_path(self, array_path: list[str], **kwargs: Any) -> None: """Get an array of string ['ArrayPath1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -1222,7 +1222,7 @@ async def array_csv_in_path(self, array_path: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1266,7 +1266,7 @@ async def unix_time_url(self, unix_time_url_path: datetime.datetime, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1326,7 +1326,7 @@ async def get_boolean_true(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1369,7 +1369,7 @@ async def get_boolean_false(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1414,7 +1414,7 @@ async def get_boolean_null(self, *, bool_query: Optional[bool] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1456,7 +1456,7 @@ async def get_int_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1499,7 +1499,7 @@ async def get_int_negative_one_million(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1544,7 +1544,7 @@ async def get_int_null(self, *, int_query: Optional[int] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1586,7 +1586,7 @@ async def get_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1629,7 +1629,7 @@ async def get_negative_ten_billion(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1674,7 +1674,7 @@ async def get_long_null(self, *, long_query: Optional[int] = None, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1716,7 +1716,7 @@ async def float_scientific_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1759,7 +1759,7 @@ async def float_scientific_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1804,7 +1804,7 @@ async def float_null(self, *, float_query: Optional[float] = None, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1846,7 +1846,7 @@ async def double_decimal_positive(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1889,7 +1889,7 @@ async def double_decimal_negative(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1934,7 +1934,7 @@ async def double_null(self, *, double_query: Optional[float] = None, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1976,7 +1976,7 @@ async def string_unicode(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2021,7 +2021,7 @@ async def string_url_encoded(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2066,7 +2066,7 @@ async def string_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2111,7 +2111,7 @@ async def string_null(self, *, string_query: Optional[str] = None, **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2156,7 +2156,7 @@ async def enum_valid(self, *, enum_query: Optional[str] = None, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2201,7 +2201,7 @@ async def enum_null(self, *, enum_query: Optional[str] = None, **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2246,7 +2246,7 @@ async def byte_multi_byte(self, *, byte_query: Optional[bytes] = None, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2288,7 +2288,7 @@ async def byte_empty(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2333,7 +2333,7 @@ async def byte_null(self, *, byte_query: Optional[bytes] = None, **kwargs: Any) 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2375,7 +2375,7 @@ async def date_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2420,7 +2420,7 @@ async def date_null(self, *, date_query: Optional[datetime.date] = None, **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2462,7 +2462,7 @@ async def date_time_valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2509,7 +2509,7 @@ async def date_time_null(self, *, date_time_query: Optional[datetime.datetime] = 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2538,7 +2538,7 @@ async def date_time_null(self, *, date_time_query: Optional[datetime.datetime] = return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_csv_valid(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_csv_valid(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -2555,7 +2555,7 @@ async def array_string_csv_valid(self, *, array_query: Optional[List[str]] = Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2584,7 +2584,7 @@ async def array_string_csv_valid(self, *, array_query: Optional[List[str]] = Non return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_csv_null(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_csv_null(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get a null array of string using the csv-array format. :keyword array_query: a null array of string using the csv-array format. Default value is None. @@ -2599,7 +2599,7 @@ async def array_string_csv_null(self, *, array_query: Optional[List[str]] = None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2628,7 +2628,7 @@ async def array_string_csv_null(self, *, array_query: Optional[List[str]] = None return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_csv_empty(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_csv_empty(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an empty array [] of string using the csv-array format. :keyword array_query: an empty array [] of string using the csv-array format. Default value is @@ -2644,7 +2644,7 @@ async def array_string_csv_empty(self, *, array_query: Optional[List[str]] = Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2674,7 +2674,7 @@ async def array_string_csv_empty(self, *, array_query: Optional[List[str]] = Non @distributed_trace_async async def array_string_no_collection_format_empty( - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Array query has no defined collection format, should default to csv. Pass in ['hello', 'nihao', 'bonjour'] for the 'arrayQuery' parameter to the service. @@ -2692,7 +2692,7 @@ async def array_string_no_collection_format_empty( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2721,7 +2721,7 @@ async def array_string_no_collection_format_empty( return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_ssv_valid(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_ssv_valid(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format. @@ -2738,7 +2738,7 @@ async def array_string_ssv_valid(self, *, array_query: Optional[List[str]] = Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2767,7 +2767,7 @@ async def array_string_ssv_valid(self, *, array_query: Optional[List[str]] = Non return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_tsv_valid(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_tsv_valid(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format. @@ -2784,7 +2784,7 @@ async def array_string_tsv_valid(self, *, array_query: Optional[List[str]] = Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2813,7 +2813,7 @@ async def array_string_tsv_valid(self, *, array_query: Optional[List[str]] = Non return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array_string_pipes_valid(self, *, array_query: Optional[List[str]] = None, **kwargs: Any) -> None: + async def array_string_pipes_valid(self, *, array_query: Optional[list[str]] = None, **kwargs: Any) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format. @@ -2830,7 +2830,7 @@ async def array_string_pipes_valid(self, *, array_query: Optional[List[str]] = N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2910,7 +2910,7 @@ async def get_all_with_values( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2977,7 +2977,7 @@ async def get_global_query_null( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3044,7 +3044,7 @@ async def get_global_and_local_query_null( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3110,7 +3110,7 @@ async def get_local_path_item_query_null( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/operations/_operations.py index e85ee1f849d..00497dba1be 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/UrlVersionTolerant/urlversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Literal, Optional, TypeVar +from typing import Any, Callable, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -526,7 +526,7 @@ def build_paths_base64_url_request(base64_url_path: bytes, **kwargs: Any) -> Htt return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) -def build_paths_array_csv_in_path_request(array_path: List[str], **kwargs: Any) -> HttpRequest: +def build_paths_array_csv_in_path_request(array_path: list[str], **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) accept = _headers.pop("Accept", "application/json") @@ -1107,7 +1107,7 @@ def build_queries_date_time_null_request( def build_queries_array_string_csv_valid_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1128,7 +1128,7 @@ def build_queries_array_string_csv_valid_request( # pylint: disable=name-too-lo def build_queries_array_string_csv_null_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1149,7 +1149,7 @@ def build_queries_array_string_csv_null_request( # pylint: disable=name-too-lon def build_queries_array_string_csv_empty_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1170,7 +1170,7 @@ def build_queries_array_string_csv_empty_request( # pylint: disable=name-too-lo def build_queries_array_string_no_collection_format_empty_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1191,7 +1191,7 @@ def build_queries_array_string_no_collection_format_empty_request( # pylint: di def build_queries_array_string_ssv_valid_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1212,7 +1212,7 @@ def build_queries_array_string_ssv_valid_request( # pylint: disable=name-too-lo def build_queries_array_string_tsv_valid_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1233,7 +1233,7 @@ def build_queries_array_string_tsv_valid_request( # pylint: disable=name-too-lo def build_queries_array_string_pipes_valid_request( # pylint: disable=name-too-long - *, array_query: Optional[List[str]] = None, **kwargs: Any + *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1440,7 +1440,7 @@ def get_boolean_true(self, **kwargs: Any) -> None: # pylint: disable=inconsiste 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1483,7 +1483,7 @@ def get_boolean_false(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1526,7 +1526,7 @@ def get_int_one_million(self, **kwargs: Any) -> None: # pylint: disable=inconsi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1569,7 +1569,7 @@ def get_int_negative_one_million(self, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1612,7 +1612,7 @@ def get_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1655,7 +1655,7 @@ def get_negative_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1698,7 +1698,7 @@ def float_scientific_positive(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1741,7 +1741,7 @@ def float_scientific_negative(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1784,7 +1784,7 @@ def double_decimal_positive(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1827,7 +1827,7 @@ def double_decimal_negative(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1870,7 +1870,7 @@ def string_unicode(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1913,7 +1913,7 @@ def string_url_encoded(self, **kwargs: Any) -> None: # pylint: disable=inconsis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1958,7 +1958,7 @@ def string_url_non_encoded(self, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2001,7 +2001,7 @@ def string_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2046,7 +2046,7 @@ def string_null(self, string_path: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2091,7 +2091,7 @@ def enum_valid(self, enum_path: str, **kwargs: Any) -> None: # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2136,7 +2136,7 @@ def enum_null(self, enum_path: str, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2182,7 +2182,7 @@ def byte_multi_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2224,7 +2224,7 @@ def byte_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2269,7 +2269,7 @@ def byte_null(self, byte_path: bytes, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2311,7 +2311,7 @@ def date_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2359,7 +2359,7 @@ def date_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2401,7 +2401,7 @@ def date_time_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2448,7 +2448,7 @@ def date_time_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2494,7 +2494,7 @@ def base64_url( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2524,7 +2524,7 @@ def base64_url( # pylint: disable=inconsistent-return-statements @distributed_trace def array_csv_in_path( # pylint: disable=inconsistent-return-statements - self, array_path: List[str], **kwargs: Any + self, array_path: list[str], **kwargs: Any ) -> None: """Get an array of string ['ArrayPath1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -2542,7 +2542,7 @@ def array_csv_in_path( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2588,7 +2588,7 @@ def unix_time_url( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2648,7 +2648,7 @@ def get_boolean_true(self, **kwargs: Any) -> None: # pylint: disable=inconsiste 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2691,7 +2691,7 @@ def get_boolean_false(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2738,7 +2738,7 @@ def get_boolean_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2780,7 +2780,7 @@ def get_int_one_million(self, **kwargs: Any) -> None: # pylint: disable=inconsi 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2823,7 +2823,7 @@ def get_int_negative_one_million(self, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2870,7 +2870,7 @@ def get_int_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2912,7 +2912,7 @@ def get_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -2955,7 +2955,7 @@ def get_negative_ten_billion(self, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3002,7 +3002,7 @@ def get_long_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3044,7 +3044,7 @@ def float_scientific_positive(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3087,7 +3087,7 @@ def float_scientific_negative(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3134,7 +3134,7 @@ def float_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3176,7 +3176,7 @@ def double_decimal_positive(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3219,7 +3219,7 @@ def double_decimal_negative(self, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3266,7 +3266,7 @@ def double_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3308,7 +3308,7 @@ def string_unicode(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3353,7 +3353,7 @@ def string_url_encoded(self, **kwargs: Any) -> None: # pylint: disable=inconsis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3398,7 +3398,7 @@ def string_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3445,7 +3445,7 @@ def string_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3492,7 +3492,7 @@ def enum_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3539,7 +3539,7 @@ def enum_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3586,7 +3586,7 @@ def byte_multi_byte( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3628,7 +3628,7 @@ def byte_empty(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3675,7 +3675,7 @@ def byte_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3717,7 +3717,7 @@ def date_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3764,7 +3764,7 @@ def date_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3806,7 +3806,7 @@ def date_time_valid(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -3855,7 +3855,7 @@ def date_time_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3885,7 +3885,7 @@ def date_time_null( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_csv_valid( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the csv-array format. @@ -3903,7 +3903,7 @@ def array_string_csv_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3933,7 +3933,7 @@ def array_string_csv_valid( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_csv_null( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get a null array of string using the csv-array format. @@ -3949,7 +3949,7 @@ def array_string_csv_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3979,7 +3979,7 @@ def array_string_csv_null( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_csv_empty( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an empty array [] of string using the csv-array format. @@ -3996,7 +3996,7 @@ def array_string_csv_empty( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4026,7 +4026,7 @@ def array_string_csv_empty( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_no_collection_format_empty( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Array query has no defined collection format, should default to csv. Pass in ['hello', 'nihao', 'bonjour'] for the 'arrayQuery' parameter to the service. @@ -4044,7 +4044,7 @@ def array_string_no_collection_format_empty( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4074,7 +4074,7 @@ def array_string_no_collection_format_empty( # pylint: disable=inconsistent-ret @distributed_trace def array_string_ssv_valid( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the ssv-array format. @@ -4092,7 +4092,7 @@ def array_string_ssv_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4122,7 +4122,7 @@ def array_string_ssv_valid( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_tsv_valid( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the tsv-array format. @@ -4140,7 +4140,7 @@ def array_string_tsv_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4170,7 +4170,7 @@ def array_string_tsv_valid( # pylint: disable=inconsistent-return-statements @distributed_trace def array_string_pipes_valid( # pylint: disable=inconsistent-return-statements - self, *, array_query: Optional[List[str]] = None, **kwargs: Any + self, *, array_query: Optional[list[str]] = None, **kwargs: Any ) -> None: """Get an array of string ['ArrayQuery1', 'begin!*'();:@ &=+$,/?#[]end' , null, ''] using the pipes-array format. @@ -4188,7 +4188,7 @@ def array_string_pipes_valid( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4268,7 +4268,7 @@ def get_all_with_values( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4335,7 +4335,7 @@ def get_global_query_null( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4402,7 +4402,7 @@ def get_global_and_local_query_null( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4468,7 +4468,7 @@ def get_local_path_item_query_null( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_operations/_operations.py index 410ca0359ab..d9d07b9388d 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -184,7 +184,7 @@ def validation_of_method_parameters(self, resource_group_name: str, id: int, **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -408,7 +408,7 @@ def validation_of_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -475,7 +475,7 @@ def get_with_constant_in_path(self, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -661,7 +661,7 @@ def post_with_constant_in_body(self, body: Optional[Union[JSON, IO[bytes]]] = No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_operations/_operations.py index d122d1080cb..24bc1fcb024 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/ValidationVersionTolerant/validationversiontolerant/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _AutoRestValidationTestOperationsMixin( @@ -84,7 +84,7 @@ async def validation_of_method_parameters(self, resource_group_name: str, id: in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -308,7 +308,7 @@ async def validation_of_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -375,7 +375,7 @@ async def get_with_constant_in_path(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -561,7 +561,7 @@ async def post_with_constant_in_body(self, body: Optional[Union[JSON, IO[bytes]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/aio/operations/_operations.py index 3f3f8927b2e..69e62cd0f6a 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/aio/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Literal, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -65,7 +65,7 @@ from .._configuration import AutoRestSwaggerBATXMLServiceConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class XmlOperations: # pylint: disable=too-many-public-methods @@ -103,7 +103,7 @@ async def get_complex_type_ref_no_meta(self, **kwargs: Any) -> _models.RootWithR 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -150,7 +150,7 @@ async def put_complex_type_ref_no_meta(self, model: _models.RootWithRefAndNoMeta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -196,7 +196,7 @@ async def get_complex_type_ref_with_meta(self, **kwargs: Any) -> _models.RootWit 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -243,7 +243,7 @@ async def put_complex_type_ref_with_meta(self, model: _models.RootWithRefAndMeta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -289,7 +289,7 @@ async def get_simple(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -337,7 +337,7 @@ async def put_simple(self, slideshow: _models.Slideshow, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -384,7 +384,7 @@ async def get_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -431,7 +431,7 @@ async def put_wrapped_lists(self, wrapped_lists: _models.AppleBarrel, **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -478,7 +478,7 @@ async def get_headers(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -522,7 +522,7 @@ async def get_empty_list(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -569,7 +569,7 @@ async def put_empty_list(self, slideshow: _models.Slideshow, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -615,7 +615,7 @@ async def get_empty_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -662,7 +662,7 @@ async def put_empty_wrapped_lists(self, apple_barrel: _models.AppleBarrel, **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -695,7 +695,7 @@ async def put_empty_wrapped_lists(self, apple_barrel: _models.AppleBarrel, **kwa return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: + async def get_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list as the root element. :return: Banana @@ -708,12 +708,12 @@ async def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_xml_get_root_list_request( headers=_headers, @@ -740,7 +740,7 @@ async def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: return deserialized # type: ignore @distributed_trace_async - async def put_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> None: + async def put_root_list(self, bananas: list[_models.Banana], **kwargs: Any) -> None: """Puts a list as the root element. :param bananas: Required. @@ -755,7 +755,7 @@ async def put_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -789,7 +789,7 @@ async def put_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> N return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: + async def get_root_list_single_item(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list with a single item. :return: Banana @@ -802,12 +802,12 @@ async def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_xml_get_root_list_single_item_request( headers=_headers, @@ -834,7 +834,7 @@ async def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana] return deserialized # type: ignore @distributed_trace_async - async def put_root_list_single_item(self, bananas: List[_models.Banana], **kwargs: Any) -> None: + async def put_root_list_single_item(self, bananas: list[_models.Banana], **kwargs: Any) -> None: """Puts a list with a single item. :param bananas: Required. @@ -849,7 +849,7 @@ async def put_root_list_single_item(self, bananas: List[_models.Banana], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -883,7 +883,7 @@ async def put_root_list_single_item(self, bananas: List[_models.Banana], **kwarg return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: + async def get_empty_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets an empty list as the root element. :return: Banana @@ -896,12 +896,12 @@ async def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_xml_get_empty_root_list_request( headers=_headers, @@ -928,7 +928,7 @@ async def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: return deserialized # type: ignore @distributed_trace_async - async def put_empty_root_list(self, bananas: List[_models.Banana], **kwargs: Any) -> None: + async def put_empty_root_list(self, bananas: list[_models.Banana], **kwargs: Any) -> None: """Puts an empty list as the root element. :param bananas: Required. @@ -943,7 +943,7 @@ async def put_empty_root_list(self, bananas: List[_models.Banana], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -990,7 +990,7 @@ async def get_empty_child_element(self, **kwargs: Any) -> _models.Banana: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1037,7 +1037,7 @@ async def put_empty_child_element(self, banana: _models.Banana, **kwargs: Any) - 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1083,7 +1083,7 @@ async def list_containers(self, **kwargs: Any) -> _models.ListContainersResponse 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1130,7 +1130,7 @@ async def get_service_properties(self, **kwargs: Any) -> _models.StorageServiceP 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1181,7 +1181,7 @@ async def put_service_properties(self, properties: _models.StorageServicePropert 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1218,7 +1218,7 @@ async def put_service_properties(self, properties: _models.StorageServicePropert return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: + async def get_acls(self, **kwargs: Any) -> list[_models.SignedIdentifier]: """Gets storage ACLs for a container. :return: SignedIdentifier @@ -1231,14 +1231,14 @@ async def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl")) restype: Literal["container"] = kwargs.pop("restype", _params.pop("restype", "container")) - cls: ClsType[List[_models.SignedIdentifier]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.SignedIdentifier]] = kwargs.pop("cls", None) _request = build_xml_get_acls_request( comp=comp, @@ -1267,7 +1267,7 @@ async def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: return deserialized # type: ignore @distributed_trace_async - async def put_acls(self, properties: List[_models.SignedIdentifier], **kwargs: Any) -> None: + async def put_acls(self, properties: list[_models.SignedIdentifier], **kwargs: Any) -> None: """Puts storage ACLs for a container. :param properties: Required. @@ -1282,7 +1282,7 @@ async def put_acls(self, properties: List[_models.SignedIdentifier], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1335,7 +1335,7 @@ async def list_blobs(self, **kwargs: Any) -> _models.ListBlobsResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1419,7 +1419,7 @@ async def json_input(self, properties: Union[_models.JSONInput, IO[bytes]], **kw 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1472,7 +1472,7 @@ async def json_output(self, **kwargs: Any) -> _models.JSONOutput: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1518,7 +1518,7 @@ async def get_xms_text(self, **kwargs: Any) -> _models.ObjectWithXMsTextProperty 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1563,7 +1563,7 @@ async def get_bytes(self, **kwargs: Any) -> _models.ModelWithByteProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1611,7 +1611,7 @@ async def put_binary(self, slideshow: _models.ModelWithByteProperty, **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1658,7 +1658,7 @@ async def get_uri(self, **kwargs: Any) -> _models.ModelWithUrlProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1706,7 +1706,7 @@ async def put_uri(self, model: _models.ModelWithUrlProperty, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/models/_models.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/models/_models.py index bf5bf1d3dc1..74faed8fcc6 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/models/_models.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/models/_models.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- import datetime -from typing import Any, Dict, List, Optional, TYPE_CHECKING, Union +from typing import Any, Optional, TYPE_CHECKING, Union from .._utils import serialization as _serialization @@ -71,7 +71,7 @@ class AppleBarrel(_serialization.Model): } def __init__( - self, *, good_apples: Optional[List[str]] = None, bad_apples: Optional[List[str]] = None, **kwargs: Any + self, *, good_apples: Optional[list[str]] = None, bad_apples: Optional[list[str]] = None, **kwargs: Any ) -> None: """ :keyword good_apples: @@ -164,7 +164,7 @@ def __init__( deleted: bool, snapshot: str, properties: "_models.BlobProperties", - metadata: Optional[Dict[str, str]] = None, + metadata: Optional[dict[str, str]] = None, **kwargs: Any ) -> None: """ @@ -457,8 +457,8 @@ class Blobs(_serialization.Model): def __init__( self, *, - blob_prefix: Optional[List["_models.BlobPrefix"]] = None, - blob: Optional[List["_models.Blob"]] = None, + blob_prefix: Optional[list["_models.BlobPrefix"]] = None, + blob: Optional[list["_models.Blob"]] = None, **kwargs: Any ) -> None: """ @@ -542,7 +542,7 @@ def __init__( *, name: str, properties: "_models.ContainerProperties", - metadata: Optional[Dict[str, str]] = None, + metadata: Optional[dict[str, str]] = None, **kwargs: Any ) -> None: """ @@ -908,7 +908,7 @@ def __init__( max_results: int, next_marker: str, marker: Optional[str] = None, - containers: Optional[List["_models.Container"]] = None, + containers: Optional[list["_models.Container"]] = None, **kwargs: Any ) -> None: """ @@ -1278,7 +1278,7 @@ def __init__( *, type: Optional[str] = None, title: Optional[str] = None, - items: Optional[List[str]] = None, + items: Optional[list[str]] = None, **kwargs: Any ) -> None: """ @@ -1322,7 +1322,7 @@ def __init__( title: Optional[str] = None, date: Optional[str] = None, author: Optional[str] = None, - slides: Optional[List["_models.Slide"]] = None, + slides: Optional[list["_models.Slide"]] = None, **kwargs: Any ) -> None: """ @@ -1378,7 +1378,7 @@ def __init__( logging: Optional["_models.Logging"] = None, hour_metrics: Optional["_models.Metrics"] = None, minute_metrics: Optional["_models.Metrics"] = None, - cors: Optional[List["_models.CorsRule"]] = None, + cors: Optional[list["_models.CorsRule"]] = None, default_service_version: Optional[str] = None, delete_retention_policy: Optional["_models.RetentionPolicy"] = None, **kwargs: Any diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/operations/_operations.py index 45e96583ae6..766f110e5b9 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmlVersionTolerant/xmlserviceversiontolerant/operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping from io import IOBase -from typing import Any, Callable, Dict, IO, List, Literal, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Literal, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -601,7 +601,7 @@ def get_complex_type_ref_no_meta(self, **kwargs: Any) -> _models.RootWithRefAndN 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -650,7 +650,7 @@ def put_complex_type_ref_no_meta( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -696,7 +696,7 @@ def get_complex_type_ref_with_meta(self, **kwargs: Any) -> _models.RootWithRefAn 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -745,7 +745,7 @@ def put_complex_type_ref_with_meta( # pylint: disable=inconsistent-return-state 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -791,7 +791,7 @@ def get_simple(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -841,7 +841,7 @@ def put_simple( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -888,7 +888,7 @@ def get_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -937,7 +937,7 @@ def put_wrapped_lists( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -984,7 +984,7 @@ def get_headers(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1028,7 +1028,7 @@ def get_empty_list(self, **kwargs: Any) -> _models.Slideshow: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1077,7 +1077,7 @@ def put_empty_list( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1123,7 +1123,7 @@ def get_empty_wrapped_lists(self, **kwargs: Any) -> _models.AppleBarrel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1172,7 +1172,7 @@ def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1205,7 +1205,7 @@ def put_empty_wrapped_lists( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: + def get_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list as the root element. :return: Banana @@ -1218,12 +1218,12 @@ def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_xml_get_root_list_request( headers=_headers, @@ -1251,7 +1251,7 @@ def get_root_list(self, **kwargs: Any) -> List[_models.Banana]: @distributed_trace def put_root_list( # pylint: disable=inconsistent-return-statements - self, bananas: List[_models.Banana], **kwargs: Any + self, bananas: list[_models.Banana], **kwargs: Any ) -> None: """Puts a list as the root element. @@ -1267,7 +1267,7 @@ def put_root_list( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1301,7 +1301,7 @@ def put_root_list( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: + def get_root_list_single_item(self, **kwargs: Any) -> list[_models.Banana]: """Gets a list with a single item. :return: Banana @@ -1314,12 +1314,12 @@ def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_xml_get_root_list_single_item_request( headers=_headers, @@ -1347,7 +1347,7 @@ def get_root_list_single_item(self, **kwargs: Any) -> List[_models.Banana]: @distributed_trace def put_root_list_single_item( # pylint: disable=inconsistent-return-statements - self, bananas: List[_models.Banana], **kwargs: Any + self, bananas: list[_models.Banana], **kwargs: Any ) -> None: """Puts a list with a single item. @@ -1363,7 +1363,7 @@ def put_root_list_single_item( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1397,7 +1397,7 @@ def put_root_list_single_item( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: + def get_empty_root_list(self, **kwargs: Any) -> list[_models.Banana]: """Gets an empty list as the root element. :return: Banana @@ -1410,12 +1410,12 @@ def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.Banana]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.Banana]] = kwargs.pop("cls", None) _request = build_xml_get_empty_root_list_request( headers=_headers, @@ -1443,7 +1443,7 @@ def get_empty_root_list(self, **kwargs: Any) -> List[_models.Banana]: @distributed_trace def put_empty_root_list( # pylint: disable=inconsistent-return-statements - self, bananas: List[_models.Banana], **kwargs: Any + self, bananas: list[_models.Banana], **kwargs: Any ) -> None: """Puts an empty list as the root element. @@ -1459,7 +1459,7 @@ def put_empty_root_list( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1506,7 +1506,7 @@ def get_empty_child_element(self, **kwargs: Any) -> _models.Banana: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1555,7 +1555,7 @@ def put_empty_child_element( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1601,7 +1601,7 @@ def list_containers(self, **kwargs: Any) -> _models.ListContainersResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1648,7 +1648,7 @@ def get_service_properties(self, **kwargs: Any) -> _models.StorageServicePropert 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1701,7 +1701,7 @@ def put_service_properties( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1738,7 +1738,7 @@ def put_service_properties( # pylint: disable=inconsistent-return-statements return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: + def get_acls(self, **kwargs: Any) -> list[_models.SignedIdentifier]: """Gets storage ACLs for a container. :return: SignedIdentifier @@ -1751,14 +1751,14 @@ def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) comp: Literal["acl"] = kwargs.pop("comp", _params.pop("comp", "acl")) restype: Literal["container"] = kwargs.pop("restype", _params.pop("restype", "container")) - cls: ClsType[List[_models.SignedIdentifier]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.SignedIdentifier]] = kwargs.pop("cls", None) _request = build_xml_get_acls_request( comp=comp, @@ -1788,7 +1788,7 @@ def get_acls(self, **kwargs: Any) -> List[_models.SignedIdentifier]: @distributed_trace def put_acls( # pylint: disable=inconsistent-return-statements - self, properties: List[_models.SignedIdentifier], **kwargs: Any + self, properties: list[_models.SignedIdentifier], **kwargs: Any ) -> None: """Puts storage ACLs for a container. @@ -1804,7 +1804,7 @@ def put_acls( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1857,7 +1857,7 @@ def list_blobs(self, **kwargs: Any) -> _models.ListBlobsResponse: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -1943,7 +1943,7 @@ def json_input( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1996,7 +1996,7 @@ def json_output(self, **kwargs: Any) -> _models.JSONOutput: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2042,7 +2042,7 @@ def get_xms_text(self, **kwargs: Any) -> _models.ObjectWithXMsTextProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2087,7 +2087,7 @@ def get_bytes(self, **kwargs: Any) -> _models.ModelWithByteProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2137,7 +2137,7 @@ def put_binary( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2184,7 +2184,7 @@ def get_uri(self, **kwargs: Any) -> _models.ModelWithUrlProperty: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -2234,7 +2234,7 @@ def put_uri( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/_utils/serialization.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/_utils/serialization.py index f5187701d7b..5f250836cf4 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/_utils/serialization.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/aio/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/aio/operations/_operations.py index a66676c2824..142e2801f95 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/aio/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PetOperations: @@ -78,7 +78,7 @@ async def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ async def do_something(self, what_action: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -192,7 +192,7 @@ async def has_models_param(self, *, models: str = "value1", **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/operations/_operations.py b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/operations/_operations.py index df76bc0d55a..c0356e8249d 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/operations/_operations.py +++ b/packages/autorest.python/test/vanilla/version-tolerant/Expected/AcceptanceTests/XmsErrorResponseVersionTolerant/xmserrorresponseversiontolerant/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar, cast +from typing import Any, Callable, Optional, TypeVar, cast from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -134,7 +134,7 @@ def get_pet_by_id(self, pet_id: str, **kwargs: Any) -> Optional[JSON]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -195,7 +195,7 @@ def do_something(self, what_action: str, **kwargs: Any) -> JSON: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -250,7 +250,7 @@ def has_models_param( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 6d0d7ca6b87..2b4dc315dcb 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -67,7 +67,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "~0.15.0", + "@typespec/http-client-python": "https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py index 104d8af49e3..ee614f99926 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -74,7 +74,7 @@ def valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -118,7 +118,7 @@ def invalid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py index 52a900f805b..214538498a8 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key-subdir/authentication/api/key/subdir/_generated/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import ApiKeyClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ApiKeyClientOperationsMixin( @@ -50,7 +50,7 @@ async def valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -94,7 +94,7 @@ async def invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py index 104d8af49e3..ee614f99926 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -74,7 +74,7 @@ def valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -118,7 +118,7 @@ def invalid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py index 52a900f805b..214538498a8 100644 --- a/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-api-key/authentication/apikey/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import ApiKeyClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ApiKeyClientOperationsMixin( @@ -50,7 +50,7 @@ async def valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -94,7 +94,7 @@ async def invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py index 7d7feb8aeb2..8df6852f7b8 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -74,7 +74,7 @@ def valid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -118,7 +118,7 @@ def invalid(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py index 27d6cc6dad0..6dfaed457c4 100644 --- a/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-oauth2/authentication/oauth2/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._configuration import OAuth2ClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _OAuth2ClientOperationsMixin( @@ -50,7 +50,7 @@ async def valid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -94,7 +94,7 @@ async def invalid(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_operations/_operations.py index 209472215fd..760e6252672 100644 --- a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -62,7 +62,7 @@ def valid_key(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -106,7 +106,7 @@ def valid_token(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/model_base.py b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/serialization.py b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/aio/_operations/_operations.py index 17ffa16469e..02988401343 100644 --- a/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/authentication-union/authentication/union/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import UnionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _UnionClientOperationsMixin( @@ -48,7 +48,7 @@ async def valid_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -92,7 +92,7 @@ async def valid_token(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py index 2973289d28f..33df61d13c9 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload +from typing import Any, Callable, IO, Iterator, Optional, TypeVar, Union, cast, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -75,7 +75,7 @@ def _long_running_rpc_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/model_base.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/serialization.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py index 9606b71f2f4..a649d318242 100644 --- a/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/azure-core-lro-rpc/specs/azure/core/lro/rpc/aio/_operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload +from typing import Any, AsyncIterator, Callable, IO, Optional, TypeVar, Union, cast, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -37,7 +37,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _RpcClientOperationsMixin( @@ -53,7 +53,7 @@ async def _long_running_rpc_initial( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/client-naming/CHANGELOG.md b/packages/typespec-python/test/azure/generated/client-naming/CHANGELOG.md deleted file mode 100644 index 628743d283a..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -# Release History - -## 1.0.0b1 (1970-01-01) - -- Initial version diff --git a/packages/typespec-python/test/azure/generated/client-naming/LICENSE b/packages/typespec-python/test/azure/generated/client-naming/LICENSE deleted file mode 100644 index 63447fd8bbb..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) Microsoft Corporation. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-naming/MANIFEST.in b/packages/typespec-python/test/azure/generated/client-naming/MANIFEST.in deleted file mode 100644 index bd52233e27f..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include *.md -include LICENSE -include client/naming/py.typed -recursive-include tests *.py -recursive-include samples *.py *.md -include client/__init__.py diff --git a/packages/typespec-python/test/azure/generated/client-naming/README.md b/packages/typespec-python/test/azure/generated/client-naming/README.md deleted file mode 100644 index aa48e878cec..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Client Naming client library for Python - - -## Getting started - -### Install the package - -```bash -python -m pip install client-naming -``` - -#### Prequisites - -- Python 3.9 or later is required to use this package. -- You need an [Azure subscription][azure_sub] to use this package. -- An existing Client Naming instance. - - -## Contributing - -This project welcomes contributions and suggestions. Most contributions require -you to agree to a Contributor License Agreement (CLA) declaring that you have -the right to, and actually do, grant us the rights to use your contribution. -For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether -you need to provide a CLA and decorate the PR appropriately (e.g., label, -comment). Simply follow the instructions provided by the bot. You will only -need to do this once across all repos using our CLA. - -This project has adopted the -[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information, -see the Code of Conduct FAQ or contact opencode@microsoft.com with any -additional questions or comments. - - -[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/ -[authenticate_with_token]: https://docs.microsoft.com/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token -[azure_identity_credentials]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#credentials -[azure_identity_pip]: https://pypi.org/project/azure-identity/ -[default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#defaultazurecredential -[pip]: https://pypi.org/project/pip/ -[azure_sub]: https://azure.microsoft.com/free/ diff --git a/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json b/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json deleted file mode 100644 index d8cf2e521bf..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/apiview-properties.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "CrossLanguagePackageId": "Client.Naming", - "CrossLanguageDefinitionId": { - "client.naming.models.ClientModel": "Client.Naming.Model.ModelWithClientClientName", - "client.naming.models.ClientNameAndJsonEncodedNameModel": "Client.Naming.Property.ClientNameAndJsonEncodedNameModel", - "client.naming.models.ClientNameModel": "Client.Naming.Property.ClientNameModel", - "client.naming.models.LanguageClientNameModel": "Client.Naming.Property.LanguageClientNameModel", - "client.naming.models.PythonModel": "Client.Naming.Model.ModelWithLanguageClientName", - "client.naming.models.ClientExtensibleEnum": "Client.Naming.UnionEnum.ServerExtensibleEnum", - "client.naming.models.ExtensibleEnum": "Client.Naming.UnionEnum.ExtensibleEnum", - "client.naming.operations.ClientModelOperations.client": "Client.Naming.Model.client", - "client.naming.aio.operations.ClientModelOperations.client": "Client.Naming.Model.client", - "client.naming.operations.ClientModelOperations.language": "Client.Naming.Model.language", - "client.naming.aio.operations.ClientModelOperations.language": "Client.Naming.Model.language", - "client.naming.operations.UnionEnumOperations.union_enum_name": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.aio.operations.UnionEnumOperations.union_enum_name": "Client.Naming.UnionEnum.unionEnumName", - "client.naming.operations.UnionEnumOperations.union_enum_member_name": "Client.Naming.UnionEnum.unionEnumMemberName", - "client.naming.aio.operations.UnionEnumOperations.union_enum_member_name": "Client.Naming.UnionEnum.unionEnumMemberName", - "client.naming.NamingClient.client_name": "Client.Naming.operation", - "client.naming.aio.NamingClient.client_name": "Client.Naming.operation", - "client.naming.NamingClient.parameter": "Client.Naming.parameter", - "client.naming.aio.NamingClient.parameter": "Client.Naming.parameter", - "client.naming.NamingClient.client": "Client.Naming.Property.client", - "client.naming.aio.NamingClient.client": "Client.Naming.Property.client", - "client.naming.NamingClient.language": "Client.Naming.Property.language", - "client.naming.aio.NamingClient.language": "Client.Naming.Property.language", - "client.naming.NamingClient.compatible_with_encoded_name": "Client.Naming.Property.compatibleWithEncodedName", - "client.naming.aio.NamingClient.compatible_with_encoded_name": "Client.Naming.Property.compatibleWithEncodedName", - "client.naming.NamingClient.request": "Client.Naming.Header.request", - "client.naming.aio.NamingClient.request": "Client.Naming.Header.request", - "client.naming.NamingClient.response": "Client.Naming.Header.response", - "client.naming.aio.NamingClient.response": "Client.Naming.Header.response" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/__init__.py deleted file mode 100644 index dd86870d8cd..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/__init__.py +++ /dev/null @@ -1,32 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._client import NamingClient # type: ignore -from ._version import VERSION - -__version__ = VERSION - -try: - from ._patch import __all__ as _patch_all - from ._patch import * -except ImportError: - _patch_all = [] -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "NamingClient", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore - -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_client.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_client.py deleted file mode 100644 index b7eef00bc32..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_client.py +++ /dev/null @@ -1,98 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from copy import deepcopy -from typing import Any -from typing_extensions import Self - -from azure.core import PipelineClient -from azure.core.pipeline import policies -from azure.core.rest import HttpRequest, HttpResponse - -from ._configuration import NamingClientConfiguration -from ._utils.serialization import Deserializer, Serializer -from .operations import ClientModelOperations, UnionEnumOperations, _NamingClientOperationsMixin - - -class NamingClient(_NamingClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Describe changing names of types in a client with ``@clientName``. - - :ivar client_model: ClientModelOperations operations - :vartype client_model: client.naming.operations.ClientModelOperations - :ivar union_enum: UnionEnumOperations operations - :vartype union_enum: client.naming.operations.UnionEnumOperations - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - """ - - def __init__( # pylint: disable=missing-client-constructor-parameter-credential - self, *, endpoint: str = "http://localhost:3000", **kwargs: Any - ) -> None: - _endpoint = "{endpoint}" - self._config = NamingClientConfiguration(endpoint=endpoint, **kwargs) - - _policies = kwargs.pop("policies", None) - if _policies is None: - _policies = [ - policies.RequestIdPolicy(**kwargs), - self._config.headers_policy, - self._config.user_agent_policy, - self._config.proxy_policy, - policies.ContentDecodePolicy(**kwargs), - self._config.redirect_policy, - self._config.retry_policy, - self._config.authentication_policy, - self._config.custom_hook_policy, - self._config.logging_policy, - policies.DistributedTracingPolicy(**kwargs), - policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, - self._config.http_logging_policy, - ] - self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - - self._serialize = Serializer() - self._deserialize = Deserializer() - self._serialize.client_side_validation = False - self.client_model = ClientModelOperations(self._client, self._config, self._serialize, self._deserialize) - self.union_enum = UnionEnumOperations(self._client, self._config, self._serialize, self._deserialize) - - def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: - """Runs the network request through the client's chained policies. - - >>> from azure.core.rest import HttpRequest - >>> request = HttpRequest("GET", "https://www.example.org/") - - >>> response = client.send_request(request) - - - For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request - - :param request: The network request you want to make. Required. - :type request: ~azure.core.rest.HttpRequest - :keyword bool stream: Whether the response payload will be streamed. Defaults to False. - :return: The response of your network call. Does not do error handling on your response. - :rtype: ~azure.core.rest.HttpResponse - """ - - request_copy = deepcopy(request) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - - request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) - return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore - - def close(self) -> None: - self._client.close() - - def __enter__(self) -> Self: - self._client.__enter__() - return self - - def __exit__(self, *exc_details: Any) -> None: - self._client.__exit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_configuration.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_configuration.py deleted file mode 100644 index 35eaafa5fb7..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_configuration.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from typing import Any - -from azure.core.pipeline import policies - -from ._version import VERSION - - -class NamingClientConfiguration: # pylint: disable=too-many-instance-attributes - """Configuration for NamingClient. - - Note that all parameters used to create this instance are saved as instance - attributes. - - :param endpoint: Service host. Default value is "http://localhost:3000". - :type endpoint: str - """ - - def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - - self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "client-naming/{}".format(VERSION)) - self.polling_interval = kwargs.get("polling_interval", 30) - self._configure(**kwargs) - - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) - self.authentication_policy = kwargs.get("authentication_policy") diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_patch.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/__init__.py deleted file mode 100644 index 8026245c2ab..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/model_base.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/model_base.py deleted file mode 100644 index 49d5c725938..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/model_base.py +++ /dev/null @@ -1,1232 +0,0 @@ -# pylint: disable=too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=protected-access, broad-except - -import copy -import calendar -import decimal -import functools -import sys -import logging -import base64 -import re -import typing -import enum -import email.utils -from datetime import datetime, date, time, timedelta, timezone -from json import JSONEncoder -import xml.etree.ElementTree as ET -from collections.abc import MutableMapping -from typing_extensions import Self -import isodate -from azure.core.exceptions import DeserializationError -from azure.core import CaseInsensitiveEnumMeta -from azure.core.pipeline import PipelineResponse -from azure.core.serialization import _Null - -_LOGGER = logging.getLogger(__name__) - -__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] - -TZ_UTC = timezone.utc -_T = typing.TypeVar("_T") - - -def _timedelta_as_isostr(td: timedelta) -> str: - """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' - - Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython - - :param timedelta td: The timedelta to convert - :rtype: str - :return: ISO8601 version of this timedelta - """ - - # Split seconds to larger units - seconds = td.total_seconds() - minutes, seconds = divmod(seconds, 60) - hours, minutes = divmod(minutes, 60) - days, hours = divmod(hours, 24) - - days, hours, minutes = list(map(int, (days, hours, minutes))) - seconds = round(seconds, 6) - - # Build date - date_str = "" - if days: - date_str = "%sD" % days - - if hours or minutes or seconds: - # Build time - time_str = "T" - - # Hours - bigger_exists = date_str or hours - if bigger_exists: - time_str += "{:02}H".format(hours) - - # Minutes - bigger_exists = bigger_exists or minutes - if bigger_exists: - time_str += "{:02}M".format(minutes) - - # Seconds - try: - if seconds.is_integer(): - seconds_string = "{:02}".format(int(seconds)) - else: - # 9 chars long w/ leading 0, 6 digits after decimal - seconds_string = "%09.6f" % seconds - # Remove trailing zeros - seconds_string = seconds_string.rstrip("0") - except AttributeError: # int.is_integer() raises - seconds_string = "{:02}".format(seconds) - - time_str += "{}S".format(seconds_string) - else: - time_str = "" - - return "P" + date_str + time_str - - -def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: - encoded = base64.b64encode(o).decode() - if format == "base64url": - return encoded.strip("=").replace("+", "-").replace("/", "_") - return encoded - - -def _serialize_datetime(o, format: typing.Optional[str] = None): - if hasattr(o, "year") and hasattr(o, "hour"): - if format == "rfc7231": - return email.utils.format_datetime(o, usegmt=True) - if format == "unix-timestamp": - return int(calendar.timegm(o.utctimetuple())) - - # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) - if not o.tzinfo: - iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() - else: - iso_formatted = o.astimezone(TZ_UTC).isoformat() - # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) - return iso_formatted.replace("+00:00", "Z") - # Next try datetime.date or datetime.time - return o.isoformat() - - -def _is_readonly(p): - try: - return p._visibility == ["read"] - except AttributeError: - return False - - -class SdkJSONEncoder(JSONEncoder): - """A JSON encoder that's capable of serializing datetime objects and bytes.""" - - def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): - super().__init__(*args, **kwargs) - self.exclude_readonly = exclude_readonly - self.format = format - - def default(self, o): # pylint: disable=too-many-return-statements - if _is_model(o): - if self.exclude_readonly: - readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] - return {k: v for k, v in o.items() if k not in readonly_props} - return dict(o.items()) - try: - return super(SdkJSONEncoder, self).default(o) - except TypeError: - if isinstance(o, _Null): - return None - if isinstance(o, decimal.Decimal): - return float(o) - if isinstance(o, (bytes, bytearray)): - return _serialize_bytes(o, self.format) - try: - # First try datetime.datetime - return _serialize_datetime(o, self.format) - except AttributeError: - pass - # Last, try datetime.timedelta - try: - return _timedelta_as_isostr(o) - except AttributeError: - # This will be raised when it hits value.total_seconds in the method above - pass - return super(SdkJSONEncoder, self).default(o) - - -_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") -_VALID_RFC7231 = re.compile( - r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" - r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" -) - - -def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: - """Deserialize ISO-8601 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - attr = attr.upper() - match = _VALID_DATE.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - check_decimal = attr.split(".") - if len(check_decimal) > 1: - decimal_str = "" - for digit in check_decimal[1]: - if digit.isdigit(): - decimal_str += digit - else: - break - if len(decimal_str) > 6: - attr = attr.replace(decimal_str, decimal_str[0:6]) - - date_obj = isodate.parse_datetime(attr) - test_utc = date_obj.utctimetuple() - if test_utc.tm_year > 9999 or test_utc.tm_year < 1: - raise OverflowError("Hit max or min date") - return date_obj - - -def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: - """Deserialize RFC7231 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - match = _VALID_RFC7231.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - return email.utils.parsedate_to_datetime(attr) - - -def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: - """Deserialize unix timestamp into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - return datetime.fromtimestamp(attr, TZ_UTC) - - -def _deserialize_date(attr: typing.Union[str, date]) -> date: - """Deserialize ISO-8601 formatted string into Date object. - :param str attr: response string to be deserialized. - :rtype: date - :returns: The date object from that input - """ - # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - if isinstance(attr, date): - return attr - return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore - - -def _deserialize_time(attr: typing.Union[str, time]) -> time: - """Deserialize ISO-8601 formatted string into time object. - - :param str attr: response string to be deserialized. - :rtype: datetime.time - :returns: The time object from that input - """ - if isinstance(attr, time): - return attr - return isodate.parse_time(attr) - - -def _deserialize_bytes(attr): - if isinstance(attr, (bytes, bytearray)): - return attr - return bytes(base64.b64decode(attr)) - - -def _deserialize_bytes_base64(attr): - if isinstance(attr, (bytes, bytearray)): - return attr - padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore - attr = attr + padding # type: ignore - encoded = attr.replace("-", "+").replace("_", "/") - return bytes(base64.b64decode(encoded)) - - -def _deserialize_duration(attr): - if isinstance(attr, timedelta): - return attr - return isodate.parse_duration(attr) - - -def _deserialize_decimal(attr): - if isinstance(attr, decimal.Decimal): - return attr - return decimal.Decimal(str(attr)) - - -def _deserialize_int_as_str(attr): - if isinstance(attr, int): - return attr - return int(attr) - - -_DESERIALIZE_MAPPING = { - datetime: _deserialize_datetime, - date: _deserialize_date, - time: _deserialize_time, - bytes: _deserialize_bytes, - bytearray: _deserialize_bytes, - timedelta: _deserialize_duration, - typing.Any: lambda x: x, - decimal.Decimal: _deserialize_decimal, -} - -_DESERIALIZE_MAPPING_WITHFORMAT = { - "rfc3339": _deserialize_datetime, - "rfc7231": _deserialize_datetime_rfc7231, - "unix-timestamp": _deserialize_datetime_unix_timestamp, - "base64": _deserialize_bytes, - "base64url": _deserialize_bytes_base64, -} - - -def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): - if annotation is int and rf and rf._format == "str": - return _deserialize_int_as_str - if rf and rf._format: - return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) - return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore - - -def _get_type_alias_type(module_name: str, alias_name: str): - types = { - k: v - for k, v in sys.modules[module_name].__dict__.items() - if isinstance(v, typing._GenericAlias) # type: ignore - } - if alias_name not in types: - return alias_name - return types[alias_name] - - -def _get_model(module_name: str, model_name: str): - models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} - module_end = module_name.rsplit(".", 1)[0] - models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) - if isinstance(model_name, str): - model_name = model_name.split(".")[-1] - if model_name not in models: - return model_name - return models[model_name] - - -_UNSET = object() - - -class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: - self._data = data - - def __contains__(self, key: typing.Any) -> bool: - return key in self._data - - def __getitem__(self, key: str) -> typing.Any: - return self._data.__getitem__(key) - - def __setitem__(self, key: str, value: typing.Any) -> None: - self._data.__setitem__(key, value) - - def __delitem__(self, key: str) -> None: - self._data.__delitem__(key) - - def __iter__(self) -> typing.Iterator[typing.Any]: - return self._data.__iter__() - - def __len__(self) -> int: - return self._data.__len__() - - def __ne__(self, other: typing.Any) -> bool: - return not self.__eq__(other) - - def keys(self) -> typing.KeysView[str]: - """ - :returns: a set-like object providing a view on D's keys - :rtype: ~typing.KeysView - """ - return self._data.keys() - - def values(self) -> typing.ValuesView[typing.Any]: - """ - :returns: an object providing a view on D's values - :rtype: ~typing.ValuesView - """ - return self._data.values() - - def items(self) -> typing.ItemsView[str, typing.Any]: - """ - :returns: set-like object providing a view on D's items - :rtype: ~typing.ItemsView - """ - return self._data.items() - - def get(self, key: str, default: typing.Any = None) -> typing.Any: - """ - Get the value for key if key is in the dictionary, else default. - :param str key: The key to look up. - :param any default: The value to return if key is not in the dictionary. Defaults to None - :returns: D[k] if k in D, else d. - :rtype: any - """ - try: - return self[key] - except KeyError: - return default - - @typing.overload - def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ - - @typing.overload - def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs - - @typing.overload - def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs - - def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: - """ - Removes specified key and return the corresponding value. - :param str key: The key to pop. - :param any default: The value to return if key is not in the dictionary - :returns: The value corresponding to the key. - :rtype: any - :raises KeyError: If key is not found and default is not given. - """ - if default is _UNSET: - return self._data.pop(key) - return self._data.pop(key, default) - - def popitem(self) -> typing.Tuple[str, typing.Any]: - """ - Removes and returns some (key, value) pair - :returns: The (key, value) pair. - :rtype: tuple - :raises KeyError: if D is empty. - """ - return self._data.popitem() - - def clear(self) -> None: - """ - Remove all items from D. - """ - self._data.clear() - - def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ - """ - Updates D from mapping/iterable E and F. - :param any args: Either a mapping object or an iterable of key-value pairs. - """ - self._data.update(*args, **kwargs) - - @typing.overload - def setdefault(self, key: str, default: None = None) -> None: ... - - @typing.overload - def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs - - def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: - """ - Same as calling D.get(k, d), and setting D[k]=d if k not found - :param str key: The key to look up. - :param any default: The value to set if key is not in the dictionary - :returns: D[k] if k in D, else d. - :rtype: any - """ - if default is _UNSET: - return self._data.setdefault(key) - return self._data.setdefault(key, default) - - def __eq__(self, other: typing.Any) -> bool: - try: - other_model = self.__class__(other) - except Exception: - return False - return self._data == other_model._data - - def __repr__(self) -> str: - return str(self._data) - - -def _is_model(obj: typing.Any) -> bool: - return getattr(obj, "_is_model", False) - - -def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements - if isinstance(o, list): - return [_serialize(x, format) for x in o] - if isinstance(o, dict): - return {k: _serialize(v, format) for k, v in o.items()} - if isinstance(o, set): - return {_serialize(x, format) for x in o} - if isinstance(o, tuple): - return tuple(_serialize(x, format) for x in o) - if isinstance(o, (bytes, bytearray)): - return _serialize_bytes(o, format) - if isinstance(o, decimal.Decimal): - return float(o) - if isinstance(o, enum.Enum): - return o.value - if isinstance(o, int): - if format == "str": - return str(o) - return o - try: - # First try datetime.datetime - return _serialize_datetime(o, format) - except AttributeError: - pass - # Last, try datetime.timedelta - try: - return _timedelta_as_isostr(o) - except AttributeError: - # This will be raised when it hits value.total_seconds in the method above - pass - return o - - -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: - try: - return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) - except StopIteration: - return None - - -def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: - if not rf: - return _serialize(value, None) - if rf._is_multipart_file_input: - return value - if rf._is_model: - return _deserialize(rf._type, value) - if isinstance(value, ET.Element): - value = _deserialize(rf._type, value) - return _serialize(value, rf._format) - - -class Model(_MyMutableMapping): - _is_model = True - # label whether current class's _attr_to_rest_field has been calculated - # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() - - def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: - class_name = self.__class__.__name__ - if len(args) > 1: - raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") - dict_to_pass = { - rest_field._rest_name: rest_field._default - for rest_field in self._attr_to_rest_field.values() - if rest_field._default is not _UNSET - } - if args: # pylint: disable=too-many-nested-blocks - if isinstance(args[0], ET.Element): - existed_attr_keys = [] - model_meta = getattr(self, "_xml", {}) - - for rf in self._attr_to_rest_field.values(): - prop_meta = getattr(rf, "_xml", {}) - xml_name = prop_meta.get("name", rf._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - # attribute - if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) - continue - - # unwrapped element is array - if prop_meta.get("unwrapped", False): - # unwrapped array could either use prop items meta/prop meta - if prop_meta.get("itemsName"): - xml_name = prop_meta.get("itemsName") - xml_ns = prop_meta.get("itemNs") - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - items = args[0].findall(xml_name) # pyright: ignore - if len(items) > 0: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) - continue - - # text element is primitive type - if prop_meta.get("text", False): - if args[0].text is not None: - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) - continue - - # wrapped element could be normal property or array, it should only have one element - item = args[0].find(xml_name) - if item is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) - - # rest thing is additional properties - for e in args[0]: - if e.tag not in existed_attr_keys: - dict_to_pass[e.tag] = _convert_element(e) - else: - dict_to_pass.update( - {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} - ) - else: - non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] - if non_attr_kwargs: - # actual type errors only throw the first wrong keyword arg they see, so following that. - raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") - dict_to_pass.update( - { - self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) - for k, v in kwargs.items() - if v is not None - } - ) - super().__init__(dict_to_pass) - - def copy(self) -> "Model": - return Model(self.__dict__) - - def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: - if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: - # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', - # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' - mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property - k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") - } - annotations = { - k: v - for mro_class in mros - if hasattr(mro_class, "__annotations__") - for k, v in mro_class.__annotations__.items() - } - for attr, rf in attr_to_rest_field.items(): - rf._module = cls.__module__ - if not rf._type: - rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) - if not rf._rest_name_input: - rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) - cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") - - return super().__new__(cls) - - def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: - for base in cls.__bases__: - if hasattr(base, "__mapping__"): - base.__mapping__[discriminator or cls.__name__] = cls # type: ignore - - @classmethod - def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: - for v in cls.__dict__.values(): - if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: - return v - return None - - @classmethod - def _deserialize(cls, data, exist_discriminators): - if not hasattr(cls, "__mapping__"): - return cls(data) - discriminator = cls._get_discriminator(exist_discriminators) - if discriminator is None: - return cls(data) - exist_discriminators.append(discriminator._rest_name) - if isinstance(data, ET.Element): - model_meta = getattr(cls, "_xml", {}) - prop_meta = getattr(discriminator, "_xml", {}) - xml_name = prop_meta.get("name", discriminator._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - if data.get(xml_name) is not None: - discriminator_value = data.get(xml_name) - else: - discriminator_value = data.find(xml_name).text # pyright: ignore - else: - discriminator_value = data.get(discriminator._rest_name) - mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member - return mapped_cls._deserialize(data, exist_discriminators) - - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: - """Return a dict that can be turned into json using json.dump. - - :keyword bool exclude_readonly: Whether to remove the readonly properties. - :returns: A dict JSON compatible object - :rtype: dict - """ - - result = {} - readonly_props = [] - if exclude_readonly: - readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] - for k, v in self.items(): - if exclude_readonly and k in readonly_props: # pyright: ignore - continue - is_multipart_file_input = False - try: - is_multipart_file_input = next( - rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k - )._is_multipart_file_input - except StopIteration: - pass - result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) - return result - - @staticmethod - def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: - if v is None or isinstance(v, _Null): - return None - if isinstance(v, (list, tuple, set)): - return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) - if isinstance(v, dict): - return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} - return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v - - -def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): - if _is_model(obj): - return obj - return _deserialize(model_deserializer, obj) - - -def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): - if obj is None: - return obj - return _deserialize_with_callable(if_obj_deserializer, obj) - - -def _deserialize_with_union(deserializers, obj): - for deserializer in deserializers: - try: - return _deserialize(deserializer, obj) - except DeserializationError: - pass - raise DeserializationError() - - -def _deserialize_dict( - value_deserializer: typing.Optional[typing.Callable], - module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], -): - if obj is None: - return obj - if isinstance(obj, ET.Element): - obj = {child.tag: child for child in obj} - return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} - - -def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], - module: typing.Optional[str], - obj, -): - if obj is None: - return obj - return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) - - -def _deserialize_sequence( - deserializer: typing.Optional[typing.Callable], - module: typing.Optional[str], - obj, -): - if obj is None: - return obj - if isinstance(obj, ET.Element): - obj = list(obj) - return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) - - -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: - return sorted( - types, - key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), - ) - - -def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches - annotation: typing.Any, - module: typing.Optional[str], - rf: typing.Optional["_RestField"] = None, -) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: - if not annotation: - return None - - # is it a type alias? - if isinstance(annotation, str): - if module is not None: - annotation = _get_type_alias_type(module, annotation) - - # is it a forward ref / in quotes? - if isinstance(annotation, (str, typing.ForwardRef)): - try: - model_name = annotation.__forward_arg__ # type: ignore - except AttributeError: - model_name = annotation - if module is not None: - annotation = _get_model(module, model_name) # type: ignore - - try: - if module and _is_model(annotation): - if rf: - rf._is_model = True - - return functools.partial(_deserialize_model, annotation) # pyright: ignore - except Exception: - pass - - # is it a literal? - try: - if annotation.__origin__ is typing.Literal: # pyright: ignore - return None - except AttributeError: - pass - - # is it optional? - try: - if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore - if len(annotation.__args__) <= 2: # pyright: ignore - if_obj_deserializer = _get_deserialize_callable_from_annotation( - next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore - ) - - return functools.partial(_deserialize_with_optional, if_obj_deserializer) - # the type is Optional[Union[...]], we need to remove the None type from the Union - annotation_copy = copy.copy(annotation) - annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore - return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) - except AttributeError: - pass - - # is it union? - if getattr(annotation, "__origin__", None) is typing.Union: - # initial ordering is we make `string` the last deserialization option, because it is often them most generic - deserializers = [ - _get_deserialize_callable_from_annotation(arg, module, rf) - for arg in _sorted_annotations(annotation.__args__) # pyright: ignore - ] - - return functools.partial(_deserialize_with_union, deserializers) - - try: - if annotation._name == "Dict": # pyright: ignore - value_deserializer = _get_deserialize_callable_from_annotation( - annotation.__args__[1], module, rf # pyright: ignore - ) - - return functools.partial( - _deserialize_dict, - value_deserializer, - module, - ) - except (AttributeError, IndexError): - pass - try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore - if len(annotation.__args__) > 1: # pyright: ignore - entry_deserializers = [ - _get_deserialize_callable_from_annotation(dt, module, rf) - for dt in annotation.__args__ # pyright: ignore - ] - return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) - deserializer = _get_deserialize_callable_from_annotation( - annotation.__args__[0], module, rf # pyright: ignore - ) - - return functools.partial(_deserialize_sequence, deserializer, module) - except (TypeError, IndexError, AttributeError, SyntaxError): - pass - - def _deserialize_default( - deserializer, - obj, - ): - if obj is None: - return obj - try: - return _deserialize_with_callable(deserializer, obj) - except Exception: - pass - return obj - - if get_deserializer(annotation, rf): - return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) - - return functools.partial(_deserialize_default, annotation) - - -def _deserialize_with_callable( - deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], - value: typing.Any, -): # pylint: disable=too-many-return-statements - try: - if value is None or isinstance(value, _Null): - return None - if isinstance(value, ET.Element): - if deserializer is str: - return value.text or "" - if deserializer is int: - return int(value.text) if value.text else None - if deserializer is float: - return float(value.text) if value.text else None - if deserializer is bool: - return value.text == "true" if value.text else None - if deserializer is None: - return value - if deserializer in [int, float, bool]: - return deserializer(value) - if isinstance(deserializer, CaseInsensitiveEnumMeta): - try: - return deserializer(value) - except ValueError: - # for unknown value, return raw value - return value - if isinstance(deserializer, type) and issubclass(deserializer, Model): - return deserializer._deserialize(value, []) - return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) - except Exception as e: - raise DeserializationError() from e - - -def _deserialize( - deserializer: typing.Any, - value: typing.Any, - module: typing.Optional[str] = None, - rf: typing.Optional["_RestField"] = None, - format: typing.Optional[str] = None, -) -> typing.Any: - if isinstance(value, PipelineResponse): - value = value.http_response.json() - if rf is None and format: - rf = _RestField(format=format) - if not isinstance(deserializer, functools.partial): - deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) - return _deserialize_with_callable(deserializer, value) - - -def _failsafe_deserialize( - deserializer: typing.Any, - value: typing.Any, - module: typing.Optional[str] = None, - rf: typing.Optional["_RestField"] = None, - format: typing.Optional[str] = None, -) -> typing.Any: - try: - return _deserialize(deserializer, value, module, rf, format) - except DeserializationError: - _LOGGER.warning( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - -def _failsafe_deserialize_xml( - deserializer: typing.Any, - value: typing.Any, -) -> typing.Any: - try: - return _deserialize_xml(deserializer, value) - except DeserializationError: - _LOGGER.warning( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - -class _RestField: - def __init__( - self, - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, - default: typing.Any = _UNSET, - format: typing.Optional[str] = None, - is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, - ): - self._type = type - self._rest_name_input = name - self._module: typing.Optional[str] = None - self._is_discriminator = is_discriminator - self._visibility = visibility - self._is_model = False - self._default = default - self._format = format - self._is_multipart_file_input = is_multipart_file_input - self._xml = xml if xml is not None else {} - - @property - def _class_type(self) -> typing.Any: - return getattr(self._type, "args", [None])[0] - - @property - def _rest_name(self) -> str: - if self._rest_name_input is None: - raise ValueError("Rest name was never set") - return self._rest_name_input - - def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin - # by this point, type and rest_name will have a value bc we default - # them in __new__ of the Model class - item = obj.get(self._rest_name) - if item is None: - return item - if self._is_model: - return item - return _deserialize(self._type, _serialize(item, self._format), rf=self) - - def __set__(self, obj: Model, value) -> None: - if value is None: - # we want to wipe out entries if users set attr to None - try: - obj.__delitem__(self._rest_name) - except KeyError: - pass - return - if self._is_model: - if not _is_model(value): - value = _deserialize(self._type, value) - obj.__setitem__(self._rest_name, value) - return - obj.__setitem__(self._rest_name, _serialize(value, self._format)) - - def _get_deserialize_callable_from_annotation( - self, annotation: typing.Any - ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: - return _get_deserialize_callable_from_annotation(annotation, self._module, self) - - -def rest_field( - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - default: typing.Any = _UNSET, - format: typing.Optional[str] = None, - is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, -) -> typing.Any: - return _RestField( - name=name, - type=type, - visibility=visibility, - default=default, - format=format, - is_multipart_file_input=is_multipart_file_input, - xml=xml, - ) - - -def rest_discriminator( - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, -) -> typing.Any: - return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) - - -def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: - """Serialize a model to XML. - - :param Model model: The model to serialize. - :param bool exclude_readonly: Whether to exclude readonly properties. - :returns: The XML representation of the model. - :rtype: str - """ - return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore - - -def _get_element( - o: typing.Any, - exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, - wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: - if _is_model(o): - model_meta = getattr(o, "_xml", {}) - - # if prop is a model, then use the prop element directly, else generate a wrapper of model - if wrapped_element is None: - wrapped_element = _create_xml_element( - model_meta.get("name", o.__class__.__name__), - model_meta.get("prefix"), - model_meta.get("ns"), - ) - - readonly_props = [] - if exclude_readonly: - readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] - - for k, v in o.items(): - # do not serialize readonly properties - if exclude_readonly and k in readonly_props: - continue - - prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) - if prop_rest_field: - prop_meta = getattr(prop_rest_field, "_xml").copy() - # use the wire name as xml name if no specific name is set - if prop_meta.get("name") is None: - prop_meta["name"] = k - else: - # additional properties will not have rest field, use the wire name as xml name - prop_meta = {"name": k} - - # if no ns for prop, use model's - if prop_meta.get("ns") is None and model_meta.get("ns"): - prop_meta["ns"] = model_meta.get("ns") - prop_meta["prefix"] = model_meta.get("prefix") - - if prop_meta.get("unwrapped", False): - # unwrapped could only set on array - wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) - elif prop_meta.get("text", False): - # text could only set on primitive type - wrapped_element.text = _get_primitive_type_value(v) - elif prop_meta.get("attribute", False): - xml_name = prop_meta.get("name", k) - if prop_meta.get("ns"): - ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore - xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore - # attribute should be primitive type - wrapped_element.set(xml_name, _get_primitive_type_value(v)) - else: - # other wrapped prop element - wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) - return wrapped_element - if isinstance(o, list): - return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore - if isinstance(o, dict): - result = [] - for k, v in o.items(): - result.append( - _get_wrapped_element( - v, - exclude_readonly, - { - "name": k, - "ns": parent_meta.get("ns") if parent_meta else None, - "prefix": parent_meta.get("prefix") if parent_meta else None, - }, - ) - ) - return result - - # primitive case need to create element based on parent_meta - if parent_meta: - return _get_wrapped_element( - o, - exclude_readonly, - { - "name": parent_meta.get("itemsName", parent_meta.get("name")), - "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), - "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), - }, - ) - - raise ValueError("Could not serialize value into xml: " + o) - - -def _get_wrapped_element( - v: typing.Any, - exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], -) -> ET.Element: - wrapped_element = _create_xml_element( - meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None - ) - if isinstance(v, (dict, list)): - wrapped_element.extend(_get_element(v, exclude_readonly, meta)) - elif _is_model(v): - _get_element(v, exclude_readonly, meta, wrapped_element) - else: - wrapped_element.text = _get_primitive_type_value(v) - return wrapped_element - - -def _get_primitive_type_value(v) -> str: - if v is True: - return "true" - if v is False: - return "false" - if isinstance(v, _Null): - return "" - return str(v) - - -def _create_xml_element(tag, prefix=None, ns=None): - if prefix and ns: - ET.register_namespace(prefix, ns) - if ns: - return ET.Element("{" + ns + "}" + tag) - return ET.Element(tag) - - -def _deserialize_xml( - deserializer: typing.Any, - value: str, -) -> typing.Any: - element = ET.fromstring(value) # nosec - return _deserialize(deserializer, element) - - -def _convert_element(e: ET.Element): - # dict case - if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} - for child in e: - if dict_result.get(child.tag) is not None: - if isinstance(dict_result[child.tag], list): - dict_result[child.tag].append(_convert_element(child)) - else: - dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] - else: - dict_result[child.tag] = _convert_element(child) - dict_result.update(e.attrib) - return dict_result - # array case - if len(e) > 0: - array_result: typing.List[typing.Any] = [] - for child in e: - array_result.append(_convert_element(child)) - return array_result - # primitive case - return e.text diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/serialization.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/serialization.py deleted file mode 100644 index eb86ea23c96..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/serialization.py +++ /dev/null @@ -1,2032 +0,0 @@ -# pylint: disable=line-too-long,useless-suppression,too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -# pyright: reportUnnecessaryTypeIgnoreComment=false - -from base64 import b64decode, b64encode -import calendar -import datetime -import decimal -import email -from enum import Enum -import json -import logging -import re -import sys -import codecs -from typing import ( - Dict, - Any, - cast, - Optional, - Union, - AnyStr, - IO, - Mapping, - Callable, - MutableMapping, - List, -) - -try: - from urllib import quote # type: ignore -except ImportError: - from urllib.parse import quote -import xml.etree.ElementTree as ET - -import isodate # type: ignore -from typing_extensions import Self - -from azure.core.exceptions import DeserializationError, SerializationError -from azure.core.serialization import NULL as CoreNull - -_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") - -JSON = MutableMapping[str, Any] - - -class RawDeserializer: - - # Accept "text" because we're open minded people... - JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") - - # Name used in context - CONTEXT_NAME = "deserialized_data" - - @classmethod - def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: - """Decode data according to content-type. - - Accept a stream of data as well, but will be load at once in memory for now. - - If no content-type, will return the string version (not bytes, not stream) - - :param data: Input, could be bytes or stream (will be decoded with UTF8) or text - :type data: str or bytes or IO - :param str content_type: The content type. - :return: The deserialized data. - :rtype: object - """ - if hasattr(data, "read"): - # Assume a stream - data = cast(IO, data).read() - - if isinstance(data, bytes): - data_as_str = data.decode(encoding="utf-8-sig") - else: - # Explain to mypy the correct type. - data_as_str = cast(str, data) - - # Remove Byte Order Mark if present in string - data_as_str = data_as_str.lstrip(_BOM) - - if content_type is None: - return data - - if cls.JSON_REGEXP.match(content_type): - try: - return json.loads(data_as_str) - except ValueError as err: - raise DeserializationError("JSON is invalid: {}".format(err), err) from err - elif "xml" in (content_type or []): - try: - - try: - if isinstance(data, unicode): # type: ignore - # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string - data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore - except NameError: - pass - - return ET.fromstring(data_as_str) # nosec - except ET.ParseError as err: - # It might be because the server has an issue, and returned JSON with - # content-type XML.... - # So let's try a JSON load, and if it's still broken - # let's flow the initial exception - def _json_attemp(data): - try: - return True, json.loads(data) - except ValueError: - return False, None # Don't care about this one - - success, json_result = _json_attemp(data) - if success: - return json_result - # If i'm here, it's not JSON, it's not XML, let's scream - # and raise the last context in this block (the XML exception) - # The function hack is because Py2.7 messes up with exception - # context otherwise. - _LOGGER.critical("Wasn't XML not JSON, failing") - raise DeserializationError("XML is invalid") from err - elif content_type.startswith("text/"): - return data_as_str - raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) - - @classmethod - def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: - """Deserialize from HTTP response. - - Use bytes and headers to NOT use any requests/aiohttp or whatever - specific implementation. - Headers will tested for "content-type" - - :param bytes body_bytes: The body of the response. - :param dict headers: The headers of the response. - :returns: The deserialized data. - :rtype: object - """ - # Try to use content-type from headers if available - content_type = None - if "content-type" in headers: - content_type = headers["content-type"].split(";")[0].strip().lower() - # Ouch, this server did not declare what it sent... - # Let's guess it's JSON... - # Also, since Autorest was considering that an empty body was a valid JSON, - # need that test as well.... - else: - content_type = "application/json" - - if body_bytes: - return cls.deserialize_from_text(body_bytes, content_type) - return None - - -_LOGGER = logging.getLogger(__name__) - -try: - _long_type = long # type: ignore -except NameError: - _long_type = int - -TZ_UTC = datetime.timezone.utc - -_FLATTEN = re.compile(r"(? None: - self.additional_properties: Optional[Dict[str, Any]] = {} - for k in kwargs: # pylint: disable=consider-using-dict-items - if k not in self._attribute_map: - _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) - elif k in self._validation and self._validation[k].get("readonly", False): - _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) - else: - setattr(self, k, kwargs[k]) - - def __eq__(self, other: Any) -> bool: - """Compare objects by comparing all attributes. - - :param object other: The object to compare - :returns: True if objects are equal - :rtype: bool - """ - if isinstance(other, self.__class__): - return self.__dict__ == other.__dict__ - return False - - def __ne__(self, other: Any) -> bool: - """Compare objects by comparing all attributes. - - :param object other: The object to compare - :returns: True if objects are not equal - :rtype: bool - """ - return not self.__eq__(other) - - def __str__(self) -> str: - return str(self.__dict__) - - @classmethod - def enable_additional_properties_sending(cls) -> None: - cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} - - @classmethod - def is_xml_model(cls) -> bool: - try: - cls._xml_map # type: ignore - except AttributeError: - return False - return True - - @classmethod - def _create_xml_node(cls): - """Create XML node. - - :returns: The XML node - :rtype: xml.etree.ElementTree.Element - """ - try: - xml_map = cls._xml_map # type: ignore - except AttributeError: - xml_map = {} - - return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) - - def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: - """Return the JSON that would be sent to server from this model. - - This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. - - If you want XML serialization, you can pass the kwargs is_xml=True. - - :param bool keep_readonly: If you want to serialize the readonly attributes - :returns: A dict JSON compatible object - :rtype: dict - """ - serializer = Serializer(self._infer_class_models()) - return serializer._serialize( # type: ignore # pylint: disable=protected-access - self, keep_readonly=keep_readonly, **kwargs - ) - - def as_dict( - self, - keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, - **kwargs: Any - ) -> JSON: - """Return a dict that can be serialized using json.dump. - - Advanced usage might optionally use a callback as parameter: - - .. code::python - - def my_key_transformer(key, attr_desc, value): - return key - - Key is the attribute name used in Python. Attr_desc - is a dict of metadata. Currently contains 'type' with the - msrest type and 'key' with the RestAPI encoded key. - Value is the current value in this object. - - The string returned will be used to serialize the key. - If the return type is a list, this is considered hierarchical - result dict. - - See the three examples in this file: - - - attribute_transformer - - full_restapi_key_transformer - - last_restapi_key_transformer - - If you want XML serialization, you can pass the kwargs is_xml=True. - - :param bool keep_readonly: If you want to serialize the readonly attributes - :param function key_transformer: A key transformer function. - :returns: A dict JSON compatible object - :rtype: dict - """ - serializer = Serializer(self._infer_class_models()) - return serializer._serialize( # type: ignore # pylint: disable=protected-access - self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs - ) - - @classmethod - def _infer_class_models(cls): - try: - str_models = cls.__module__.rsplit(".", 1)[0] - models = sys.modules[str_models] - client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - if cls.__name__ not in client_models: - raise ValueError("Not Autorest generated code") - except Exception: # pylint: disable=broad-exception-caught - # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. - client_models = {cls.__name__: cls} - return client_models - - @classmethod - def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: - """Parse a str using the RestAPI syntax and return a model. - - :param str data: A str using RestAPI structure. JSON by default. - :param str content_type: JSON by default, set application/xml if XML. - :returns: An instance of this model - :raises DeserializationError: if something went wrong - :rtype: Self - """ - deserializer = Deserializer(cls._infer_class_models()) - return deserializer(cls.__name__, data, content_type=content_type) # type: ignore - - @classmethod - def from_dict( - cls, - data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, - content_type: Optional[str] = None, - ) -> Self: - """Parse a dict using given key extractor return a model. - - By default consider key - extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor - and last_rest_key_case_insensitive_extractor) - - :param dict data: A dict using RestAPI structure - :param function key_extractors: A key extractor function. - :param str content_type: JSON by default, set application/xml if XML. - :returns: An instance of this model - :raises DeserializationError: if something went wrong - :rtype: Self - """ - deserializer = Deserializer(cls._infer_class_models()) - deserializer.key_extractors = ( # type: ignore - [ # type: ignore - attribute_key_case_insensitive_extractor, - rest_key_case_insensitive_extractor, - last_rest_key_case_insensitive_extractor, - ] - if key_extractors is None - else key_extractors - ) - return deserializer(cls.__name__, data, content_type=content_type) # type: ignore - - @classmethod - def _flatten_subtype(cls, key, objects): - if "_subtype_map" not in cls.__dict__: - return {} - result = dict(cls._subtype_map[key]) - for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access - return result - - @classmethod - def _classify(cls, response, objects): - """Check the class _subtype_map for any child classes. - We want to ignore any inherited _subtype_maps. - - :param dict response: The initial data - :param dict objects: The class objects - :returns: The class to be used - :rtype: class - """ - for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): - subtype_value = None - - if not isinstance(response, ET.Element): - rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] - subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) - else: - subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) - if subtype_value: - # Try to match base class. Can be class name only - # (bug to fix in Autorest to support x-ms-discriminator-name) - if cls.__name__ == subtype_value: - return cls - flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) - try: - return objects[flatten_mapping_type[subtype_value]] # type: ignore - except KeyError: - _LOGGER.warning( - "Subtype value %s has no mapping, use base class %s.", - subtype_value, - cls.__name__, - ) - break - else: - _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) - break - return cls - - @classmethod - def _get_rest_key_parts(cls, attr_key): - """Get the RestAPI key of this attr, split it and decode part - :param str attr_key: Attribute key must be in attribute_map. - :returns: A list of RestAPI part - :rtype: list - """ - rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) - return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] - - -def _decode_attribute_map_key(key): - """This decode a key in an _attribute_map to the actual key we want to look at - inside the received data. - - :param str key: A key string from the generated code - :returns: The decoded key - :rtype: str - """ - return key.replace("\\.", ".") - - -class Serializer: # pylint: disable=too-many-public-methods - """Request object model serializer.""" - - basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - - _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} - days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} - months = { - 1: "Jan", - 2: "Feb", - 3: "Mar", - 4: "Apr", - 5: "May", - 6: "Jun", - 7: "Jul", - 8: "Aug", - 9: "Sep", - 10: "Oct", - 11: "Nov", - 12: "Dec", - } - validation = { - "min_length": lambda x, y: len(x) < y, - "max_length": lambda x, y: len(x) > y, - "minimum": lambda x, y: x < y, - "maximum": lambda x, y: x > y, - "minimum_ex": lambda x, y: x <= y, - "maximum_ex": lambda x, y: x >= y, - "min_items": lambda x, y: len(x) < y, - "max_items": lambda x, y: len(x) > y, - "pattern": lambda x, y: not re.match(y, x, re.UNICODE), - "unique": lambda x, y: len(x) != len(set(x)), - "multiple": lambda x, y: x % y != 0, - } - - def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: - self.serialize_type = { - "iso-8601": Serializer.serialize_iso, - "rfc-1123": Serializer.serialize_rfc, - "unix-time": Serializer.serialize_unix, - "duration": Serializer.serialize_duration, - "date": Serializer.serialize_date, - "time": Serializer.serialize_time, - "decimal": Serializer.serialize_decimal, - "long": Serializer.serialize_long, - "bytearray": Serializer.serialize_bytearray, - "base64": Serializer.serialize_base64, - "object": self.serialize_object, - "[]": self.serialize_iter, - "{}": self.serialize_dict, - } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} - self.key_transformer = full_restapi_key_transformer - self.client_side_validation = True - - def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals - self, target_obj, data_type=None, **kwargs - ): - """Serialize data into a string according to type. - - :param object target_obj: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str, dict - :raises SerializationError: if serialization fails. - :returns: The serialized data. - """ - key_transformer = kwargs.get("key_transformer", self.key_transformer) - keep_readonly = kwargs.get("keep_readonly", False) - if target_obj is None: - return None - - attr_name = None - class_name = target_obj.__class__.__name__ - - if data_type: - return self.serialize_data(target_obj, data_type, **kwargs) - - if not hasattr(target_obj, "_attribute_map"): - data_type = type(target_obj).__name__ - if data_type in self.basic_types.values(): - return self.serialize_data(target_obj, data_type, **kwargs) - - # Force "is_xml" kwargs if we detect a XML model - try: - is_xml_model_serialization = kwargs["is_xml"] - except KeyError: - is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) - - serialized = {} - if is_xml_model_serialization: - serialized = target_obj._create_xml_node() # pylint: disable=protected-access - try: - attributes = target_obj._attribute_map # pylint: disable=protected-access - for attr, attr_desc in attributes.items(): - attr_name = attr - if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access - attr_name, {} - ).get("readonly", False): - continue - - if attr_name == "additional_properties" and attr_desc["key"] == "": - if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) - continue - try: - - orig_attr = getattr(target_obj, attr) - if is_xml_model_serialization: - pass # Don't provide "transformer" for XML for now. Keep "orig_attr" - else: # JSON - keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) - keys = keys if isinstance(keys, list) else [keys] - - kwargs["serialization_ctxt"] = attr_desc - new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) - - if is_xml_model_serialization: - xml_desc = attr_desc.get("xml", {}) - xml_name = xml_desc.get("name", attr_desc["key"]) - xml_prefix = xml_desc.get("prefix", None) - xml_ns = xml_desc.get("ns", None) - if xml_desc.get("attr", False): - if xml_ns: - ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - serialized.set(xml_name, new_attr) # type: ignore - continue - if xml_desc.get("text", False): - serialized.text = new_attr # type: ignore - continue - if isinstance(new_attr, list): - serialized.extend(new_attr) # type: ignore - elif isinstance(new_attr, ET.Element): - # If the down XML has no XML/Name, - # we MUST replace the tag with the local tag. But keeping the namespaces. - if "name" not in getattr(orig_attr, "_xml_map", {}): - splitted_tag = new_attr.tag.split("}") - if len(splitted_tag) == 2: # Namespace - new_attr.tag = "}".join([splitted_tag[0], xml_name]) - else: - new_attr.tag = xml_name - serialized.append(new_attr) # type: ignore - else: # That's a basic type - # Integrate namespace if necessary - local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) - serialized.append(local_node) # type: ignore - else: # JSON - for k in reversed(keys): # type: ignore - new_attr = {k: new_attr} - - _new_attr = new_attr - _serialized = serialized - for k in keys: # type: ignore - if k not in _serialized: - _serialized.update(_new_attr) # type: ignore - _new_attr = _new_attr[k] # type: ignore - _serialized = _serialized[k] - except ValueError as err: - if isinstance(err, SerializationError): - raise - - except (AttributeError, KeyError, TypeError) as err: - msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) - raise SerializationError(msg) from err - return serialized - - def body(self, data, data_type, **kwargs): - """Serialize data intended for a request body. - - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: dict - :raises SerializationError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized request body - """ - - # Just in case this is a dict - internal_data_type_str = data_type.strip("[]{}") - internal_data_type = self.dependencies.get(internal_data_type_str, None) - try: - is_xml_model_serialization = kwargs["is_xml"] - except KeyError: - if internal_data_type and issubclass(internal_data_type, Model): - is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) - else: - is_xml_model_serialization = False - if internal_data_type and not isinstance(internal_data_type, Enum): - try: - deserializer = Deserializer(self.dependencies) - # Since it's on serialization, it's almost sure that format is not JSON REST - # We're not able to deal with additional properties for now. - deserializer.additional_properties_detection = False - if is_xml_model_serialization: - deserializer.key_extractors = [ # type: ignore - attribute_key_case_insensitive_extractor, - ] - else: - deserializer.key_extractors = [ - rest_key_case_insensitive_extractor, - attribute_key_case_insensitive_extractor, - last_rest_key_case_insensitive_extractor, - ] - data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access - except DeserializationError as err: - raise SerializationError("Unable to build a model: " + str(err)) from err - - return self._serialize(data, data_type, **kwargs) - - def url(self, name, data, data_type, **kwargs): - """Serialize data intended for a URL path. - - :param str name: The name of the URL path parameter. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str - :returns: The serialized URL path - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - """ - try: - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - - if kwargs.get("skip_quote") is True: - output = str(output) - output = output.replace("{", quote("{")).replace("}", quote("}")) - else: - output = quote(str(output), safe="") - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return output - - def query(self, name, data, data_type, **kwargs): - """Serialize data intended for a URL query. - - :param str name: The name of the query parameter. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str, list - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized query parameter - """ - try: - # Treat the list aside, since we don't want to encode the div separator - if data_type.startswith("["): - internal_data_type = data_type[1:-1] - do_quote = not kwargs.get("skip_quote", False) - return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) - - # Not a list, regular serialization - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - if kwargs.get("skip_quote") is True: - output = str(output) - else: - output = quote(str(output), safe="") - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return str(output) - - def header(self, name, data, data_type, **kwargs): - """Serialize data intended for a request header. - - :param str name: The name of the header. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized header - """ - try: - if data_type in ["[str]"]: - data = ["" if d is None else d for d in data] - - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return str(output) - - def serialize_data(self, data, data_type, **kwargs): - """Serialize generic data according to supplied data type. - - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :raises AttributeError: if required data is None. - :raises ValueError: if data is None - :raises SerializationError: if serialization fails. - :returns: The serialized data. - :rtype: str, int, float, bool, dict, list - """ - if data is None: - raise ValueError("No value for given attribute") - - try: - if data is CoreNull: - return None - if data_type in self.basic_types.values(): - return self.serialize_basic(data, data_type, **kwargs) - - if data_type in self.serialize_type: - return self.serialize_type[data_type](data, **kwargs) - - # If dependencies is empty, try with current data class - # It has to be a subclass of Enum anyway - enum_type = self.dependencies.get(data_type, data.__class__) - if issubclass(enum_type, Enum): - return Serializer.serialize_enum(data, enum_obj=enum_type) - - iter_type = data_type[0] + data_type[-1] - if iter_type in self.serialize_type: - return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) - - except (ValueError, TypeError) as err: - msg = "Unable to serialize value: {!r} as type: {!r}." - raise SerializationError(msg.format(data, data_type)) from err - return self._serialize(data, **kwargs) - - @classmethod - def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements - custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) - if custom_serializer: - return custom_serializer - if kwargs.get("is_xml", False): - return cls._xml_basic_types_serializers.get(data_type) - - @classmethod - def serialize_basic(cls, data, data_type, **kwargs): - """Serialize basic builting data type. - Serializes objects to str, int, float or bool. - - Possible kwargs: - - basic_types_serializers dict[str, callable] : If set, use the callable as serializer - - is_xml bool : If set, use xml_basic_types_serializers - - :param obj data: Object to be serialized. - :param str data_type: Type of object in the iterable. - :rtype: str, int, float, bool - :return: serialized object - """ - custom_serializer = cls._get_custom_serializers(data_type, **kwargs) - if custom_serializer: - return custom_serializer(data) - if data_type == "str": - return cls.serialize_unicode(data) - return eval(data_type)(data) # nosec # pylint: disable=eval-used - - @classmethod - def serialize_unicode(cls, data): - """Special handling for serializing unicode strings in Py2. - Encode to UTF-8 if unicode, otherwise handle as a str. - - :param str data: Object to be serialized. - :rtype: str - :return: serialized object - """ - try: # If I received an enum, return its value - return data.value - except AttributeError: - pass - - try: - if isinstance(data, unicode): # type: ignore - # Don't change it, JSON and XML ElementTree are totally able - # to serialize correctly u'' strings - return data - except NameError: - return str(data) - return str(data) - - def serialize_iter(self, data, iter_type, div=None, **kwargs): - """Serialize iterable. - - Supported kwargs: - - serialization_ctxt dict : The current entry of _attribute_map, or same format. - serialization_ctxt['type'] should be same as data_type. - - is_xml bool : If set, serialize as XML - - :param list data: Object to be serialized. - :param str iter_type: Type of object in the iterable. - :param str div: If set, this str will be used to combine the elements - in the iterable into a combined string. Default is 'None'. - Defaults to False. - :rtype: list, str - :return: serialized iterable - """ - if isinstance(data, str): - raise SerializationError("Refuse str type as a valid iter type.") - - serialization_ctxt = kwargs.get("serialization_ctxt", {}) - is_xml = kwargs.get("is_xml", False) - - serialized = [] - for d in data: - try: - serialized.append(self.serialize_data(d, iter_type, **kwargs)) - except ValueError as err: - if isinstance(err, SerializationError): - raise - serialized.append(None) - - if kwargs.get("do_quote", False): - serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] - - if div: - serialized = ["" if s is None else str(s) for s in serialized] - serialized = div.join(serialized) - - if "xml" in serialization_ctxt or is_xml: - # XML serialization is more complicated - xml_desc = serialization_ctxt.get("xml", {}) - xml_name = xml_desc.get("name") - if not xml_name: - xml_name = serialization_ctxt["key"] - - # Create a wrap node if necessary (use the fact that Element and list have "append") - is_wrapped = xml_desc.get("wrapped", False) - node_name = xml_desc.get("itemsName", xml_name) - if is_wrapped: - final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - else: - final_result = [] - # All list elements to "local_node" - for el in serialized: - if isinstance(el, ET.Element): - el_node = el - else: - el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - if el is not None: # Otherwise it writes "None" :-p - el_node.text = str(el) - final_result.append(el_node) - return final_result - return serialized - - def serialize_dict(self, attr, dict_type, **kwargs): - """Serialize a dictionary of objects. - - :param dict attr: Object to be serialized. - :param str dict_type: Type of object in the dictionary. - :rtype: dict - :return: serialized dictionary - """ - serialization_ctxt = kwargs.get("serialization_ctxt", {}) - serialized = {} - for key, value in attr.items(): - try: - serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) - except ValueError as err: - if isinstance(err, SerializationError): - raise - serialized[self.serialize_unicode(key)] = None - - if "xml" in serialization_ctxt: - # XML serialization is more complicated - xml_desc = serialization_ctxt["xml"] - xml_name = xml_desc["name"] - - final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - for key, value in serialized.items(): - ET.SubElement(final_result, key).text = value - return final_result - - return serialized - - def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements - """Serialize a generic object. - This will be handled as a dictionary. If object passed in is not - a basic type (str, int, float, dict, list) it will simply be - cast to str. - - :param dict attr: Object to be serialized. - :rtype: dict or str - :return: serialized object - """ - if attr is None: - return None - if isinstance(attr, ET.Element): - return attr - obj_type = type(attr) - if obj_type in self.basic_types: - return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) - if obj_type is _long_type: - return self.serialize_long(attr) - if obj_type is str: - return self.serialize_unicode(attr) - if obj_type is datetime.datetime: - return self.serialize_iso(attr) - if obj_type is datetime.date: - return self.serialize_date(attr) - if obj_type is datetime.time: - return self.serialize_time(attr) - if obj_type is datetime.timedelta: - return self.serialize_duration(attr) - if obj_type is decimal.Decimal: - return self.serialize_decimal(attr) - - # If it's a model or I know this dependency, serialize as a Model - if obj_type in self.dependencies.values() or isinstance(attr, Model): - return self._serialize(attr) - - if obj_type == dict: - serialized = {} - for key, value in attr.items(): - try: - serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) - except ValueError: - serialized[self.serialize_unicode(key)] = None - return serialized - - if obj_type == list: - serialized = [] - for obj in attr: - try: - serialized.append(self.serialize_object(obj, **kwargs)) - except ValueError: - pass - return serialized - return str(attr) - - @staticmethod - def serialize_enum(attr, enum_obj=None): - try: - result = attr.value - except AttributeError: - result = attr - try: - enum_obj(result) # type: ignore - return result - except ValueError as exc: - for enum_value in enum_obj: # type: ignore - if enum_value.value.lower() == str(attr).lower(): - return enum_value.value - error = "{!r} is not valid value for enum {!r}" - raise SerializationError(error.format(attr, enum_obj)) from exc - - @staticmethod - def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument - """Serialize bytearray into base-64 string. - - :param str attr: Object to be serialized. - :rtype: str - :return: serialized base64 - """ - return b64encode(attr).decode() - - @staticmethod - def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument - """Serialize str into base-64 string. - - :param str attr: Object to be serialized. - :rtype: str - :return: serialized base64 - """ - encoded = b64encode(attr).decode("ascii") - return encoded.strip("=").replace("+", "-").replace("/", "_") - - @staticmethod - def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Decimal object to float. - - :param decimal attr: Object to be serialized. - :rtype: float - :return: serialized decimal - """ - return float(attr) - - @staticmethod - def serialize_long(attr, **kwargs): # pylint: disable=unused-argument - """Serialize long (Py2) or int (Py3). - - :param int attr: Object to be serialized. - :rtype: int/long - :return: serialized long - """ - return _long_type(attr) - - @staticmethod - def serialize_date(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Date object into ISO-8601 formatted string. - - :param Date attr: Object to be serialized. - :rtype: str - :return: serialized date - """ - if isinstance(attr, str): - attr = isodate.parse_date(attr) - t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) - return t - - @staticmethod - def serialize_time(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Time object into ISO-8601 formatted string. - - :param datetime.time attr: Object to be serialized. - :rtype: str - :return: serialized time - """ - if isinstance(attr, str): - attr = isodate.parse_time(attr) - t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) - if attr.microsecond: - t += ".{:02}".format(attr.microsecond) - return t - - @staticmethod - def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument - """Serialize TimeDelta object into ISO-8601 formatted string. - - :param TimeDelta attr: Object to be serialized. - :rtype: str - :return: serialized duration - """ - if isinstance(attr, str): - attr = isodate.parse_duration(attr) - return isodate.duration_isoformat(attr) - - @staticmethod - def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into RFC-1123 formatted string. - - :param Datetime attr: Object to be serialized. - :rtype: str - :raises TypeError: if format invalid. - :return: serialized rfc - """ - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - utc = attr.utctimetuple() - except AttributeError as exc: - raise TypeError("RFC1123 object must be valid Datetime object.") from exc - - return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( - Serializer.days[utc.tm_wday], - utc.tm_mday, - Serializer.months[utc.tm_mon], - utc.tm_year, - utc.tm_hour, - utc.tm_min, - utc.tm_sec, - ) - - @staticmethod - def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into ISO-8601 formatted string. - - :param Datetime attr: Object to be serialized. - :rtype: str - :raises SerializationError: if format invalid. - :return: serialized iso - """ - if isinstance(attr, str): - attr = isodate.parse_datetime(attr) - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - utc = attr.utctimetuple() - if utc.tm_year > 9999 or utc.tm_year < 1: - raise OverflowError("Hit max or min date") - - microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") - if microseconds: - microseconds = "." + microseconds - date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( - utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec - ) - return date + microseconds + "Z" - except (ValueError, OverflowError) as err: - msg = "Unable to serialize datetime object." - raise SerializationError(msg) from err - except AttributeError as err: - msg = "ISO-8601 object must be valid Datetime object." - raise TypeError(msg) from err - - @staticmethod - def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into IntTime format. - This is represented as seconds. - - :param Datetime attr: Object to be serialized. - :rtype: int - :raises SerializationError: if format invalid - :return: serialied unix - """ - if isinstance(attr, int): - return attr - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - return int(calendar.timegm(attr.utctimetuple())) - except AttributeError as exc: - raise TypeError("Unix time object must be valid Datetime object.") from exc - - -def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - key = attr_desc["key"] - working_data = data - - while "." in key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) - if len(dict_keys) == 1: - key = _decode_attribute_map_key(dict_keys[0]) - break - working_key = _decode_attribute_map_key(dict_keys[0]) - working_data = working_data.get(working_key, data) - if working_data is None: - # If at any point while following flatten JSON path see None, it means - # that all properties under are None as well - return None - key = ".".join(dict_keys[1:]) - - return working_data.get(key) - - -def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements - attr, attr_desc, data -): - key = attr_desc["key"] - working_data = data - - while "." in key: - dict_keys = _FLATTEN.split(key) - if len(dict_keys) == 1: - key = _decode_attribute_map_key(dict_keys[0]) - break - working_key = _decode_attribute_map_key(dict_keys[0]) - working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) - if working_data is None: - # If at any point while following flatten JSON path see None, it means - # that all properties under are None as well - return None - key = ".".join(dict_keys[1:]) - - if working_data: - return attribute_key_case_insensitive_extractor(key, None, working_data) - - -def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - """Extract the attribute in "data" based on the last part of the JSON path key. - - :param str attr: The attribute to extract - :param dict attr_desc: The attribute description - :param dict data: The data to extract from - :rtype: object - :returns: The extracted attribute - """ - key = attr_desc["key"] - dict_keys = _FLATTEN.split(key) - return attribute_key_extractor(dict_keys[-1], None, data) - - -def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - """Extract the attribute in "data" based on the last part of the JSON path key. - - This is the case insensitive version of "last_rest_key_extractor" - :param str attr: The attribute to extract - :param dict attr_desc: The attribute description - :param dict data: The data to extract from - :rtype: object - :returns: The extracted attribute - """ - key = attr_desc["key"] - dict_keys = _FLATTEN.split(key) - return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) - - -def attribute_key_extractor(attr, _, data): - return data.get(attr) - - -def attribute_key_case_insensitive_extractor(attr, _, data): - found_key = None - lower_attr = attr.lower() - for key in data: - if lower_attr == key.lower(): - found_key = key - break - - return data.get(found_key) - - -def _extract_name_from_internal_type(internal_type): - """Given an internal type XML description, extract correct XML name with namespace. - - :param dict internal_type: An model type - :rtype: tuple - :returns: A tuple XML name + namespace dict - """ - internal_type_xml_map = getattr(internal_type, "_xml_map", {}) - xml_name = internal_type_xml_map.get("name", internal_type.__name__) - xml_ns = internal_type_xml_map.get("ns", None) - if xml_ns: - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - return xml_name - - -def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements - if isinstance(data, dict): - return None - - # Test if this model is XML ready first - if not isinstance(data, ET.Element): - return None - - xml_desc = attr_desc.get("xml", {}) - xml_name = xml_desc.get("name", attr_desc["key"]) - - # Look for a children - is_iter_type = attr_desc["type"].startswith("[") - is_wrapped = xml_desc.get("wrapped", False) - internal_type = attr_desc.get("internalType", None) - internal_type_xml_map = getattr(internal_type, "_xml_map", {}) - - # Integrate namespace if necessary - xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) - if xml_ns: - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - - # If it's an attribute, that's simple - if xml_desc.get("attr", False): - return data.get(xml_name) - - # If it's x-ms-text, that's simple too - if xml_desc.get("text", False): - return data.text - - # Scenario where I take the local name: - # - Wrapped node - # - Internal type is an enum (considered basic types) - # - Internal type has no XML/Name node - if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): - children = data.findall(xml_name) - # If internal type has a local name and it's not a list, I use that name - elif not is_iter_type and internal_type and "name" in internal_type_xml_map: - xml_name = _extract_name_from_internal_type(internal_type) - children = data.findall(xml_name) - # That's an array - else: - if internal_type: # Complex type, ignore itemsName and use the complex type name - items_name = _extract_name_from_internal_type(internal_type) - else: - items_name = xml_desc.get("itemsName", xml_name) - children = data.findall(items_name) - - if len(children) == 0: - if is_iter_type: - if is_wrapped: - return None # is_wrapped no node, we want None - return [] # not wrapped, assume empty list - return None # Assume it's not there, maybe an optional node. - - # If is_iter_type and not wrapped, return all found children - if is_iter_type: - if not is_wrapped: - return children - # Iter and wrapped, should have found one node only (the wrap one) - if len(children) != 1: - raise DeserializationError( - "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( - xml_name - ) - ) - return list(children[0]) # Might be empty list and that's ok. - - # Here it's not a itertype, we should have found one element only or empty - if len(children) > 1: - raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) - return children[0] - - -class Deserializer: - """Response object model deserializer. - - :param dict classes: Class type dictionary for deserializing complex types. - :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. - """ - - basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - - valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - - def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: - self.deserialize_type = { - "iso-8601": Deserializer.deserialize_iso, - "rfc-1123": Deserializer.deserialize_rfc, - "unix-time": Deserializer.deserialize_unix, - "duration": Deserializer.deserialize_duration, - "date": Deserializer.deserialize_date, - "time": Deserializer.deserialize_time, - "decimal": Deserializer.deserialize_decimal, - "long": Deserializer.deserialize_long, - "bytearray": Deserializer.deserialize_bytearray, - "base64": Deserializer.deserialize_base64, - "object": self.deserialize_object, - "[]": self.deserialize_iter, - "{}": self.deserialize_dict, - } - self.deserialize_expected_types = { - "duration": (isodate.Duration, datetime.timedelta), - "iso-8601": (datetime.datetime), - } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} - self.key_extractors = [rest_key_extractor, xml_key_extractor] - # Additional properties only works if the "rest_key_extractor" is used to - # extract the keys. Making it to work whatever the key extractor is too much - # complicated, with no real scenario for now. - # So adding a flag to disable additional properties detection. This flag should be - # used if your expect the deserialization to NOT come from a JSON REST syntax. - # Otherwise, result are unexpected - self.additional_properties_detection = True - - def __call__(self, target_obj, response_data, content_type=None): - """Call the deserializer to process a REST response. - - :param str target_obj: Target data type to deserialize to. - :param requests.Response response_data: REST response object. - :param str content_type: Swagger "produces" if available. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - data = self._unpack_content(response_data, content_type) - return self._deserialize(target_obj, data) - - def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements - """Call the deserializer on a model. - - Data needs to be already deserialized as JSON or XML ElementTree - - :param str target_obj: Target data type to deserialize to. - :param object data: Object to deserialize. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - # This is already a model, go recursive just in case - if hasattr(data, "_attribute_map"): - constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] - try: - for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access - if attr in constants: - continue - value = getattr(data, attr) - if value is None: - continue - local_type = mapconfig["type"] - internal_data_type = local_type.strip("[]{}") - if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): - continue - setattr(data, attr, self._deserialize(local_type, value)) - return data - except AttributeError: - return - - response, class_name = self._classify_target(target_obj, data) - - if isinstance(response, str): - return self.deserialize_data(data, response) - if isinstance(response, type) and issubclass(response, Enum): - return self.deserialize_enum(data, response) - - if data is None or data is CoreNull: - return data - try: - attributes = response._attribute_map # type: ignore # pylint: disable=protected-access - d_attrs = {} - for attr, attr_desc in attributes.items(): - # Check empty string. If it's not empty, someone has a real "additionalProperties"... - if attr == "additional_properties" and attr_desc["key"] == "": - continue - raw_value = None - # Enhance attr_desc with some dynamic data - attr_desc = attr_desc.copy() # Do a copy, do not change the real one - internal_data_type = attr_desc["type"].strip("[]{}") - if internal_data_type in self.dependencies: - attr_desc["internalType"] = self.dependencies[internal_data_type] - - for key_extractor in self.key_extractors: - found_value = key_extractor(attr, attr_desc, data) - if found_value is not None: - if raw_value is not None and raw_value != found_value: - msg = ( - "Ignoring extracted value '%s' from %s for key '%s'" - " (duplicate extraction, follow extractors order)" - ) - _LOGGER.warning(msg, found_value, key_extractor, attr) - continue - raw_value = found_value - - value = self.deserialize_data(raw_value, attr_desc["type"]) - d_attrs[attr] = value - except (AttributeError, TypeError, KeyError) as err: - msg = "Unable to deserialize to object: " + class_name # type: ignore - raise DeserializationError(msg) from err - additional_properties = self._build_additional_properties(attributes, data) - return self._instantiate_model(response, d_attrs, additional_properties) - - def _build_additional_properties(self, attribute_map, data): - if not self.additional_properties_detection: - return None - if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": - # Check empty string. If it's not empty, someone has a real "additionalProperties" - return None - if isinstance(data, ET.Element): - data = {el.tag: el.text for el in data} - - known_keys = { - _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) - for desc in attribute_map.values() - if desc["key"] != "" - } - present_keys = set(data.keys()) - missing_keys = present_keys - known_keys - return {key: data[key] for key in missing_keys} - - def _classify_target(self, target, data): - """Check to see whether the deserialization target object can - be classified into a subclass. - Once classification has been determined, initialize object. - - :param str target: The target object type to deserialize to. - :param str/dict data: The response data to deserialize. - :return: The classified target object and its class name. - :rtype: tuple - """ - if target is None: - return None, None - - if isinstance(target, str): - try: - target = self.dependencies[target] - except KeyError: - return target, target - - try: - target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access - except AttributeError: - pass # Target is not a Model, no classify - return target, target.__class__.__name__ # type: ignore - - def failsafe_deserialize(self, target_obj, data, content_type=None): - """Ignores any errors encountered in deserialization, - and falls back to not deserializing the object. Recommended - for use in error deserialization, as we want to return the - HttpResponseError to users, and not have them deal with - a deserialization error. - - :param str target_obj: The target object type to deserialize to. - :param str/dict data: The response data to deserialize. - :param str content_type: Swagger "produces" if available. - :return: Deserialized object. - :rtype: object - """ - try: - return self(target_obj, data, content_type=content_type) - except: # pylint: disable=bare-except - _LOGGER.debug( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - @staticmethod - def _unpack_content(raw_data, content_type=None): - """Extract the correct structure for deserialization. - - If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. - if we can't, raise. Your Pipeline should have a RawDeserializer. - - If not a pipeline response and raw_data is bytes or string, use content-type - to decode it. If no content-type, try JSON. - - If raw_data is something else, bypass all logic and return it directly. - - :param obj raw_data: Data to be processed. - :param str content_type: How to parse if raw_data is a string/bytes. - :raises JSONDecodeError: If JSON is requested and parsing is impossible. - :raises UnicodeDecodeError: If bytes is not UTF8 - :rtype: object - :return: Unpacked content. - """ - # Assume this is enough to detect a Pipeline Response without importing it - context = getattr(raw_data, "context", {}) - if context: - if RawDeserializer.CONTEXT_NAME in context: - return context[RawDeserializer.CONTEXT_NAME] - raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") - - # Assume this is enough to recognize universal_http.ClientResponse without importing it - if hasattr(raw_data, "body"): - return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) - - # Assume this enough to recognize requests.Response without importing it. - if hasattr(raw_data, "_content_consumed"): - return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): - return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore - return raw_data - - def _instantiate_model(self, response, attrs, additional_properties=None): - """Instantiate a response model passing in deserialized args. - - :param Response response: The response model class. - :param dict attrs: The deserialized response attributes. - :param dict additional_properties: Additional properties to be set. - :rtype: Response - :return: The instantiated response model. - """ - if callable(response): - subtype = getattr(response, "_subtype_map", {}) - try: - readonly = [ - k - for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore - if v.get("readonly") - ] - const = [ - k - for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore - if v.get("constant") - ] - kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} - response_obj = response(**kwargs) - for attr in readonly: - setattr(response_obj, attr, attrs.get(attr)) - if additional_properties: - response_obj.additional_properties = additional_properties # type: ignore - return response_obj - except TypeError as err: - msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore - raise DeserializationError(msg + str(err)) from err - else: - try: - for attr, value in attrs.items(): - setattr(response, attr, value) - return response - except Exception as exp: - msg = "Unable to populate response model. " - msg += "Type: {}, Error: {}".format(type(response), exp) - raise DeserializationError(msg) from exp - - def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements - """Process data for deserialization according to data type. - - :param str data: The response string to be deserialized. - :param str data_type: The type to deserialize to. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - if data is None: - return data - - try: - if not data_type: - return data - if data_type in self.basic_types.values(): - return self.deserialize_basic(data, data_type) - if data_type in self.deserialize_type: - if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): - return data - - is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment - "object", - "[]", - r"{}", - ] - if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: - return None - data_val = self.deserialize_type[data_type](data) - return data_val - - iter_type = data_type[0] + data_type[-1] - if iter_type in self.deserialize_type: - return self.deserialize_type[iter_type](data, data_type[1:-1]) - - obj_type = self.dependencies[data_type] - if issubclass(obj_type, Enum): - if isinstance(data, ET.Element): - data = data.text - return self.deserialize_enum(data, obj_type) - - except (ValueError, TypeError, AttributeError) as err: - msg = "Unable to deserialize response data." - msg += " Data: {}, {}".format(data, data_type) - raise DeserializationError(msg) from err - return self._deserialize(obj_type, data) - - def deserialize_iter(self, attr, iter_type): - """Deserialize an iterable. - - :param list attr: Iterable to be deserialized. - :param str iter_type: The type of object in the iterable. - :return: Deserialized iterable. - :rtype: list - """ - if attr is None: - return None - if isinstance(attr, ET.Element): # If I receive an element here, get the children - attr = list(attr) - if not isinstance(attr, (list, set)): - raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) - return [self.deserialize_data(a, iter_type) for a in attr] - - def deserialize_dict(self, attr, dict_type): - """Deserialize a dictionary. - - :param dict/list attr: Dictionary to be deserialized. Also accepts - a list of key, value pairs. - :param str dict_type: The object type of the items in the dictionary. - :return: Deserialized dictionary. - :rtype: dict - """ - if isinstance(attr, list): - return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} - - if isinstance(attr, ET.Element): - # Transform value into {"Key": "value"} - attr = {el.tag: el.text for el in attr} - return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} - - def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements - """Deserialize a generic object. - This will be handled as a dictionary. - - :param dict attr: Dictionary to be deserialized. - :return: Deserialized object. - :rtype: dict - :raises TypeError: if non-builtin datatype encountered. - """ - if attr is None: - return None - if isinstance(attr, ET.Element): - # Do no recurse on XML, just return the tree as-is - return attr - if isinstance(attr, str): - return self.deserialize_basic(attr, "str") - obj_type = type(attr) - if obj_type in self.basic_types: - return self.deserialize_basic(attr, self.basic_types[obj_type]) - if obj_type is _long_type: - return self.deserialize_long(attr) - - if obj_type == dict: - deserialized = {} - for key, value in attr.items(): - try: - deserialized[key] = self.deserialize_object(value, **kwargs) - except ValueError: - deserialized[key] = None - return deserialized - - if obj_type == list: - deserialized = [] - for obj in attr: - try: - deserialized.append(self.deserialize_object(obj, **kwargs)) - except ValueError: - pass - return deserialized - - error = "Cannot deserialize generic object with type: " - raise TypeError(error + str(obj_type)) - - def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements - """Deserialize basic builtin data type from string. - Will attempt to convert to str, int, float and bool. - This function will also accept '1', '0', 'true' and 'false' as - valid bool values. - - :param str attr: response string to be deserialized. - :param str data_type: deserialization data type. - :return: Deserialized basic type. - :rtype: str, int, float or bool - :raises TypeError: if string format is not valid. - """ - # If we're here, data is supposed to be a basic type. - # If it's still an XML node, take the text - if isinstance(attr, ET.Element): - attr = attr.text - if not attr: - if data_type == "str": - # None or '', node is empty string. - return "" - # None or '', node with a strong type is None. - # Don't try to model "empty bool" or "empty int" - return None - - if data_type == "bool": - if attr in [True, False, 1, 0]: - return bool(attr) - if isinstance(attr, str): - if attr.lower() in ["true", "1"]: - return True - if attr.lower() in ["false", "0"]: - return False - raise TypeError("Invalid boolean value: {}".format(attr)) - - if data_type == "str": - return self.deserialize_unicode(attr) - return eval(data_type)(attr) # nosec # pylint: disable=eval-used - - @staticmethod - def deserialize_unicode(data): - """Preserve unicode objects in Python 2, otherwise return data - as a string. - - :param str data: response string to be deserialized. - :return: Deserialized string. - :rtype: str or unicode - """ - # We might be here because we have an enum modeled as string, - # and we try to deserialize a partial dict with enum inside - if isinstance(data, Enum): - return data - - # Consider this is real string - try: - if isinstance(data, unicode): # type: ignore - return data - except NameError: - return str(data) - return str(data) - - @staticmethod - def deserialize_enum(data, enum_obj): - """Deserialize string into enum object. - - If the string is not a valid enum value it will be returned as-is - and a warning will be logged. - - :param str data: Response string to be deserialized. If this value is - None or invalid it will be returned as-is. - :param Enum enum_obj: Enum object to deserialize to. - :return: Deserialized enum object. - :rtype: Enum - """ - if isinstance(data, enum_obj) or data is None: - return data - if isinstance(data, Enum): - data = data.value - if isinstance(data, int): - # Workaround. We might consider remove it in the future. - try: - return list(enum_obj.__members__.values())[data] - except IndexError as exc: - error = "{!r} is not a valid index for enum {!r}" - raise DeserializationError(error.format(data, enum_obj)) from exc - try: - return enum_obj(str(data)) - except ValueError: - for enum_value in enum_obj: - if enum_value.value.lower() == str(data).lower(): - return enum_value - # We don't fail anymore for unknown value, we deserialize as a string - _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) - return Deserializer.deserialize_unicode(data) - - @staticmethod - def deserialize_bytearray(attr): - """Deserialize string into bytearray. - - :param str attr: response string to be deserialized. - :return: Deserialized bytearray - :rtype: bytearray - :raises TypeError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - return bytearray(b64decode(attr)) # type: ignore - - @staticmethod - def deserialize_base64(attr): - """Deserialize base64 encoded string into string. - - :param str attr: response string to be deserialized. - :return: Deserialized base64 string - :rtype: bytearray - :raises TypeError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore - attr = attr + padding # type: ignore - encoded = attr.replace("-", "+").replace("_", "/") - return b64decode(encoded) - - @staticmethod - def deserialize_decimal(attr): - """Deserialize string into Decimal object. - - :param str attr: response string to be deserialized. - :return: Deserialized decimal - :raises DeserializationError: if string format invalid. - :rtype: decimal - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - return decimal.Decimal(str(attr)) # type: ignore - except decimal.DecimalException as err: - msg = "Invalid decimal {}".format(attr) - raise DeserializationError(msg) from err - - @staticmethod - def deserialize_long(attr): - """Deserialize string into long (Py2) or int (Py3). - - :param str attr: response string to be deserialized. - :return: Deserialized int - :rtype: long or int - :raises ValueError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - return _long_type(attr) # type: ignore - - @staticmethod - def deserialize_duration(attr): - """Deserialize ISO-8601 formatted string into TimeDelta object. - - :param str attr: response string to be deserialized. - :return: Deserialized duration - :rtype: TimeDelta - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - duration = isodate.parse_duration(attr) - except (ValueError, OverflowError, AttributeError) as err: - msg = "Cannot deserialize duration object." - raise DeserializationError(msg) from err - return duration - - @staticmethod - def deserialize_date(attr): - """Deserialize ISO-8601 formatted string into Date object. - - :param str attr: response string to be deserialized. - :return: Deserialized date - :rtype: Date - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore - raise DeserializationError("Date must have only digits and -. Received: %s" % attr) - # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - return isodate.parse_date(attr, defaultmonth=0, defaultday=0) - - @staticmethod - def deserialize_time(attr): - """Deserialize ISO-8601 formatted string into time object. - - :param str attr: response string to be deserialized. - :return: Deserialized time - :rtype: datetime.time - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore - raise DeserializationError("Date must have only digits and -. Received: %s" % attr) - return isodate.parse_time(attr) - - @staticmethod - def deserialize_rfc(attr): - """Deserialize RFC-1123 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :return: Deserialized RFC datetime - :rtype: Datetime - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - parsed_date = email.utils.parsedate_tz(attr) # type: ignore - date_obj = datetime.datetime( - *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) - ) - if not date_obj.tzinfo: - date_obj = date_obj.astimezone(tz=TZ_UTC) - except ValueError as err: - msg = "Cannot deserialize to rfc datetime object." - raise DeserializationError(msg) from err - return date_obj - - @staticmethod - def deserialize_iso(attr): - """Deserialize ISO-8601 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :return: Deserialized ISO datetime - :rtype: Datetime - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - attr = attr.upper() # type: ignore - match = Deserializer.valid_date.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - check_decimal = attr.split(".") - if len(check_decimal) > 1: - decimal_str = "" - for digit in check_decimal[1]: - if digit.isdigit(): - decimal_str += digit - else: - break - if len(decimal_str) > 6: - attr = attr.replace(decimal_str, decimal_str[0:6]) - - date_obj = isodate.parse_datetime(attr) - test_utc = date_obj.utctimetuple() - if test_utc.tm_year > 9999 or test_utc.tm_year < 1: - raise OverflowError("Hit max or min date") - except (ValueError, OverflowError, AttributeError) as err: - msg = "Cannot deserialize datetime object." - raise DeserializationError(msg) from err - return date_obj - - @staticmethod - def deserialize_unix(attr): - """Serialize Datetime object into IntTime format. - This is represented as seconds. - - :param int attr: Object to be serialized. - :return: Deserialized datetime - :rtype: Datetime - :raises DeserializationError: if format invalid - """ - if isinstance(attr, ET.Element): - attr = int(attr.text) # type: ignore - try: - attr = int(attr) - date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) - except ValueError as err: - msg = "Cannot deserialize to unix datetime object." - raise DeserializationError(msg) from err - return date_obj diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/utils.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/utils.py deleted file mode 100644 index 35c9c836f85..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_utils/utils.py +++ /dev/null @@ -1,25 +0,0 @@ -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from abc import ABC -from typing import Generic, TYPE_CHECKING, TypeVar - -if TYPE_CHECKING: - from .serialization import Deserializer, Serializer - - -TClient = TypeVar("TClient") -TConfig = TypeVar("TConfig") - - -class ClientMixinABC(ABC, Generic[TClient, TConfig]): - """DO NOT use this class. It is for internal typing use only.""" - - _client: TClient - _config: TConfig - _serialize: "Serializer" - _deserialize: "Deserializer" diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_version.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/_version.py deleted file mode 100644 index be71c81bd28..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/_version.py +++ /dev/null @@ -1,9 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/__init__.py deleted file mode 100644 index db076018c2a..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._client import NamingClient # type: ignore - -try: - from ._patch import __all__ as _patch_all - from ._patch import * -except ImportError: - _patch_all = [] -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "NamingClient", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore - -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_client.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_client.py deleted file mode 100644 index 84e825c8725..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_client.py +++ /dev/null @@ -1,100 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from copy import deepcopy -from typing import Any, Awaitable -from typing_extensions import Self - -from azure.core import AsyncPipelineClient -from azure.core.pipeline import policies -from azure.core.rest import AsyncHttpResponse, HttpRequest - -from .._utils.serialization import Deserializer, Serializer -from ._configuration import NamingClientConfiguration -from .operations import ClientModelOperations, UnionEnumOperations, _NamingClientOperationsMixin - - -class NamingClient(_NamingClientOperationsMixin): # pylint: disable=client-accepts-api-version-keyword - """Describe changing names of types in a client with ``@clientName``. - - :ivar client_model: ClientModelOperations operations - :vartype client_model: client.naming.aio.operations.ClientModelOperations - :ivar union_enum: UnionEnumOperations operations - :vartype union_enum: client.naming.aio.operations.UnionEnumOperations - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - """ - - def __init__( # pylint: disable=missing-client-constructor-parameter-credential - self, *, endpoint: str = "http://localhost:3000", **kwargs: Any - ) -> None: - _endpoint = "{endpoint}" - self._config = NamingClientConfiguration(endpoint=endpoint, **kwargs) - - _policies = kwargs.pop("policies", None) - if _policies is None: - _policies = [ - policies.RequestIdPolicy(**kwargs), - self._config.headers_policy, - self._config.user_agent_policy, - self._config.proxy_policy, - policies.ContentDecodePolicy(**kwargs), - self._config.redirect_policy, - self._config.retry_policy, - self._config.authentication_policy, - self._config.custom_hook_policy, - self._config.logging_policy, - policies.DistributedTracingPolicy(**kwargs), - policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, - self._config.http_logging_policy, - ] - self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - - self._serialize = Serializer() - self._deserialize = Deserializer() - self._serialize.client_side_validation = False - self.client_model = ClientModelOperations(self._client, self._config, self._serialize, self._deserialize) - self.union_enum = UnionEnumOperations(self._client, self._config, self._serialize, self._deserialize) - - def send_request( - self, request: HttpRequest, *, stream: bool = False, **kwargs: Any - ) -> Awaitable[AsyncHttpResponse]: - """Runs the network request through the client's chained policies. - - >>> from azure.core.rest import HttpRequest - >>> request = HttpRequest("GET", "https://www.example.org/") - - >>> response = await client.send_request(request) - - - For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request - - :param request: The network request you want to make. Required. - :type request: ~azure.core.rest.HttpRequest - :keyword bool stream: Whether the response payload will be streamed. Defaults to False. - :return: The response of your network call. Does not do error handling on your response. - :rtype: ~azure.core.rest.AsyncHttpResponse - """ - - request_copy = deepcopy(request) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - - request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) - return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore - - async def close(self) -> None: - await self._client.close() - - async def __aenter__(self) -> Self: - await self._client.__aenter__() - return self - - async def __aexit__(self, *exc_details: Any) -> None: - await self._client.__aexit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_configuration.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_configuration.py deleted file mode 100644 index 1688b25d189..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_configuration.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from typing import Any - -from azure.core.pipeline import policies - -from .._version import VERSION - - -class NamingClientConfiguration: # pylint: disable=too-many-instance-attributes - """Configuration for NamingClient. - - Note that all parameters used to create this instance are saved as instance - attributes. - - :param endpoint: Service host. Default value is "http://localhost:3000". - :type endpoint: str - """ - - def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - - self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "client-naming/{}".format(VERSION)) - self.polling_interval = kwargs.get("polling_interval", 30) - self._configure(**kwargs) - - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) - self.authentication_policy = kwargs.get("authentication_policy") diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_patch.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/__init__.py deleted file mode 100644 index 60dbba1776e..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._operations import ClientModelOperations # type: ignore -from ._operations import UnionEnumOperations # type: ignore -from ._operations import _NamingClientOperationsMixin # type: ignore # pylint: disable=unused-import - -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "ClientModelOperations", - "UnionEnumOperations", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py deleted file mode 100644 index c504e7294cf..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_operations.py +++ /dev/null @@ -1,882 +0,0 @@ -# pylint: disable=line-too-long,useless-suppression -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from collections.abc import MutableMapping -from io import IOBase -import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload - -from azure.core import AsyncPipelineClient -from azure.core.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - map_error, -) -from azure.core.pipeline import PipelineResponse -from azure.core.rest import AsyncHttpResponse, HttpRequest -from azure.core.tracing.decorator_async import distributed_trace_async -from azure.core.utils import case_insensitive_dict - -from ... import models as _models -from ..._utils.model_base import SdkJSONEncoder -from ..._utils.serialization import Deserializer, Serializer -from ..._utils.utils import ClientMixinABC -from ...operations._operations import ( - build_client_model_client_request, - build_client_model_language_request, - build_naming_client_name_request, - build_naming_client_request, - build_naming_compatible_with_encoded_name_request, - build_naming_language_request, - build_naming_parameter_request, - build_naming_request_request, - build_naming_response_request, - build_union_enum_union_enum_member_name_request, - build_union_enum_union_enum_name_request, -) -from .._configuration import NamingClientConfiguration - -JSON = MutableMapping[str, Any] -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] - - -class ClientModelOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.naming.aio.NamingClient`'s - :attr:`client_model` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: NamingClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @overload - async def client(self, body: _models.ClientModel, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: ~client.naming.models.ClientModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def client(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def client(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def client(self, body: Union[_models.ClientModel, JSON, IO[bytes]], **kwargs: Any) -> None: - """client. - - :param body: Is one of the following types: ClientModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.ClientModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_client_model_client_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - async def language( - self, body: _models.PythonModel, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """language. - - :param body: Required. - :type body: ~client.naming.models.PythonModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def language(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def language(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def language(self, body: Union[_models.PythonModel, JSON, IO[bytes]], **kwargs: Any) -> None: - """language. - - :param body: Is one of the following types: PythonModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.PythonModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_client_model_language_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class UnionEnumOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.naming.aio.NamingClient`'s - :attr:`union_enum` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: NamingClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def union_enum_name(self, body: Union[str, _models.ClientExtensibleEnum], **kwargs: Any) -> None: - """union_enum_name. - - :param body: "value1" Required. - :type body: str or ~client.naming.models.ClientExtensibleEnum - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: str = kwargs.pop("content_type", _headers.pop("content-type", "application/json")) - cls: ClsType[None] = kwargs.pop("cls", None) - - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_union_enum_union_enum_name_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace_async - async def union_enum_member_name(self, body: Union[str, _models.ExtensibleEnum], **kwargs: Any) -> None: - """union_enum_member_name. - - :param body: Known values are: "value1" and "value2". Required. - :type body: str or ~client.naming.models.ExtensibleEnum - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: str = kwargs.pop("content_type", _headers.pop("content-type", "application/json")) - cls: ClsType[None] = kwargs.pop("cls", None) - - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_union_enum_union_enum_member_name_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class _NamingClientOperationsMixin( - ClientMixinABC[AsyncPipelineClient[HttpRequest, AsyncHttpResponse], NamingClientConfiguration] -): - - @distributed_trace_async - async def client_name(self, **kwargs: Any) -> None: - """client_name. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_client_name_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace_async - async def parameter(self, *, client_name: str, **kwargs: Any) -> None: - """parameter. - - :keyword client_name: Required. - :paramtype client_name: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_parameter_request( - client_name=client_name, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - async def client( - self, body: _models.ClientNameModel, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """client. - - :param body: Required. - :type body: ~client.naming.models.ClientNameModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def client(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def client(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def client(self, body: Union[_models.ClientNameModel, JSON, IO[bytes]], **kwargs: Any) -> None: - """client. - - :param body: Is one of the following types: ClientNameModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.ClientNameModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_naming_client_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - async def language( - self, body: _models.LanguageClientNameModel, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """language. - - :param body: Required. - :type body: ~client.naming.models.LanguageClientNameModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def language(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def language(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def language(self, body: Union[_models.LanguageClientNameModel, JSON, IO[bytes]], **kwargs: Any) -> None: - """language. - - :param body: Is one of the following types: LanguageClientNameModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.LanguageClientNameModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_naming_language_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - async def compatible_with_encoded_name( - self, body: _models.ClientNameAndJsonEncodedNameModel, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Required. - :type body: ~client.naming.models.ClientNameAndJsonEncodedNameModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def compatible_with_encoded_name( - self, body: JSON, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def compatible_with_encoded_name( - self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def compatible_with_encoded_name( - self, body: Union[_models.ClientNameAndJsonEncodedNameModel, JSON, IO[bytes]], **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Is one of the following types: ClientNameAndJsonEncodedNameModel, JSON, IO[bytes] - Required. - :type body: ~client.naming.models.ClientNameAndJsonEncodedNameModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_naming_compatible_with_encoded_name_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace_async - async def request(self, *, client_name: str, **kwargs: Any) -> None: - """request. - - :keyword client_name: Required. - :paramtype client_name: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_request_request( - client_name=client_name, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace_async - async def response(self, **kwargs: Any) -> None: - """response. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_response_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # type: ignore # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - response_headers = {} - response_headers["default-name"] = self._deserialize("str", response.headers.get("default-name")) - - if cls: - return cls(pipeline_response, None, response_headers) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/aio/operations/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/__init__.py deleted file mode 100644 index 4c81085e1ca..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - - -from ._models import ( # type: ignore - ClientModel, - ClientNameAndJsonEncodedNameModel, - ClientNameModel, - LanguageClientNameModel, - PythonModel, -) - -from ._enums import ( # type: ignore - ClientExtensibleEnum, - ExtensibleEnum, -) -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "ClientModel", - "ClientNameAndJsonEncodedNameModel", - "ClientNameModel", - "LanguageClientNameModel", - "PythonModel", - "ClientExtensibleEnum", - "ExtensibleEnum", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_enums.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_enums.py deleted file mode 100644 index f9715a7ef73..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_enums.py +++ /dev/null @@ -1,23 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from enum import Enum -from azure.core import CaseInsensitiveEnumMeta - - -class ClientExtensibleEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """Type of ClientExtensibleEnum.""" - - ENUM_VALUE1 = "value1" - - -class ExtensibleEnum(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """Type of ExtensibleEnum.""" - - CLIENT_ENUM_VALUE1 = "value1" - CLIENT_ENUM_VALUE2 = "value2" diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_models.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_models.py deleted file mode 100644 index 21efec01276..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_models.py +++ /dev/null @@ -1,152 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=useless-super-delegation - -from typing import Any, Mapping, overload - -from .._utils.model_base import Model as _Model, rest_field - - -class ClientModel(_Model): - """ClientModel. - - :ivar default_name: Pass in true. Required. - :vartype default_name: bool - """ - - default_name: bool = rest_field(name="defaultName", visibility=["read", "create", "update", "delete", "query"]) - """Pass in true. Required.""" - - @overload - def __init__( - self, - *, - default_name: bool, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class ClientNameAndJsonEncodedNameModel(_Model): - """ClientNameAndJsonEncodedNameModel. - - :ivar client_name: Pass in true. Required. - :vartype client_name: bool - """ - - client_name: bool = rest_field(name="wireName", visibility=["read", "create", "update", "delete", "query"]) - """Pass in true. Required.""" - - @overload - def __init__( - self, - *, - client_name: bool, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class ClientNameModel(_Model): - """ClientNameModel. - - :ivar client_name: Pass in true. Required. - :vartype client_name: bool - """ - - client_name: bool = rest_field(name="defaultName", visibility=["read", "create", "update", "delete", "query"]) - """Pass in true. Required.""" - - @overload - def __init__( - self, - *, - client_name: bool, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class LanguageClientNameModel(_Model): - """LanguageClientNameModel. - - :ivar python_name: Pass in true. Required. - :vartype python_name: bool - """ - - python_name: bool = rest_field(name="defaultName", visibility=["read", "create", "update", "delete", "query"]) - """Pass in true. Required.""" - - @overload - def __init__( - self, - *, - python_name: bool, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class PythonModel(_Model): - """PythonModel. - - :ivar default_name: Pass in true. Required. - :vartype default_name: bool - """ - - default_name: bool = rest_field(name="defaultName", visibility=["read", "create", "update", "delete", "query"]) - """Pass in true. Required.""" - - @overload - def __init__( - self, - *, - default_name: bool, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_patch.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/models/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/__init__.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/__init__.py deleted file mode 100644 index 60dbba1776e..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._operations import ClientModelOperations # type: ignore -from ._operations import UnionEnumOperations # type: ignore -from ._operations import _NamingClientOperationsMixin # type: ignore # pylint: disable=unused-import - -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "ClientModelOperations", - "UnionEnumOperations", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py deleted file mode 100644 index eb41fd88a56..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_operations.py +++ /dev/null @@ -1,1014 +0,0 @@ -# pylint: disable=too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from collections.abc import MutableMapping -from io import IOBase -import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload - -from azure.core import PipelineClient -from azure.core.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - map_error, -) -from azure.core.pipeline import PipelineResponse -from azure.core.rest import HttpRequest, HttpResponse -from azure.core.tracing.decorator import distributed_trace -from azure.core.utils import case_insensitive_dict - -from .. import models as _models -from .._configuration import NamingClientConfiguration -from .._utils.model_base import SdkJSONEncoder -from .._utils.serialization import Deserializer, Serializer -from .._utils.utils import ClientMixinABC - -JSON = MutableMapping[str, Any] -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] - -_SERIALIZER = Serializer() -_SERIALIZER.client_side_validation = False - - -def build_client_model_client_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/client/naming/model/client" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_client_model_language_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/client/naming/model/language" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_union_enum_union_enum_name_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: str = kwargs.pop("content_type") - # Construct URL - _url = "/client/naming/union-enum/union-enum-name" - - # Construct headers - _headers["content-type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_union_enum_union_enum_member_name_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: str = kwargs.pop("content_type") - # Construct URL - _url = "/client/naming/union-enum/union-enum-member-name" - - # Construct headers - _headers["content-type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_naming_client_name_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/client/naming/operation" - - return HttpRequest(method="POST", url=_url, **kwargs) - - -def build_naming_parameter_request(*, client_name: str, **kwargs: Any) -> HttpRequest: - _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - - # Construct URL - _url = "/client/naming/parameter" - - # Construct parameters - _params["defaultName"] = _SERIALIZER.query("client_name", client_name, "str") - - return HttpRequest(method="POST", url=_url, params=_params, **kwargs) - - -def build_naming_client_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/client/naming/property/client" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_naming_language_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/client/naming/property/language" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_naming_compatible_with_encoded_name_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/client/naming/property/compatible-with-encoded-name" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_naming_request_request(*, client_name: str, **kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - # Construct URL - _url = "/client/naming/header" - - # Construct headers - _headers["default-name"] = _SERIALIZER.header("client_name", client_name, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_naming_response_request(**kwargs: Any) -> HttpRequest: - # Construct URL - _url = "/client/naming/header" - - return HttpRequest(method="GET", url=_url, **kwargs) - - -class ClientModelOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.naming.NamingClient`'s - :attr:`client_model` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: NamingClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @overload - def client(self, body: _models.ClientModel, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: ~client.naming.models.ClientModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def client(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def client(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def client( # pylint: disable=inconsistent-return-statements - self, body: Union[_models.ClientModel, JSON, IO[bytes]], **kwargs: Any - ) -> None: - """client. - - :param body: Is one of the following types: ClientModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.ClientModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_client_model_client_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - def language(self, body: _models.PythonModel, *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: ~client.naming.models.PythonModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def language(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def language(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def language( # pylint: disable=inconsistent-return-statements - self, body: Union[_models.PythonModel, JSON, IO[bytes]], **kwargs: Any - ) -> None: - """language. - - :param body: Is one of the following types: PythonModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.PythonModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_client_model_language_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class UnionEnumOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~client.naming.NamingClient`'s - :attr:`union_enum` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: NamingClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def union_enum_name( # pylint: disable=inconsistent-return-statements - self, body: Union[str, _models.ClientExtensibleEnum], **kwargs: Any - ) -> None: - """union_enum_name. - - :param body: "value1" Required. - :type body: str or ~client.naming.models.ClientExtensibleEnum - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: str = kwargs.pop("content_type", _headers.pop("content-type", "application/json")) - cls: ClsType[None] = kwargs.pop("cls", None) - - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_union_enum_union_enum_name_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace - def union_enum_member_name( # pylint: disable=inconsistent-return-statements - self, body: Union[str, _models.ExtensibleEnum], **kwargs: Any - ) -> None: - """union_enum_member_name. - - :param body: Known values are: "value1" and "value2". Required. - :type body: str or ~client.naming.models.ExtensibleEnum - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: str = kwargs.pop("content_type", _headers.pop("content-type", "application/json")) - cls: ClsType[None] = kwargs.pop("cls", None) - - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_union_enum_union_enum_member_name_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class _NamingClientOperationsMixin( - ClientMixinABC[PipelineClient[HttpRequest, HttpResponse], NamingClientConfiguration] -): - - @distributed_trace - def client_name(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """client_name. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_client_name_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace - def parameter(self, *, client_name: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """parameter. - - :keyword client_name: Required. - :paramtype client_name: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_parameter_request( - client_name=client_name, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - def client(self, body: _models.ClientNameModel, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: ~client.naming.models.ClientNameModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def client(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def client(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """client. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def client( # pylint: disable=inconsistent-return-statements - self, body: Union[_models.ClientNameModel, JSON, IO[bytes]], **kwargs: Any - ) -> None: - """client. - - :param body: Is one of the following types: ClientNameModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.ClientNameModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_naming_client_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - def language( - self, body: _models.LanguageClientNameModel, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """language. - - :param body: Required. - :type body: ~client.naming.models.LanguageClientNameModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def language(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def language(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """language. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def language( # pylint: disable=inconsistent-return-statements - self, body: Union[_models.LanguageClientNameModel, JSON, IO[bytes]], **kwargs: Any - ) -> None: - """language. - - :param body: Is one of the following types: LanguageClientNameModel, JSON, IO[bytes] Required. - :type body: ~client.naming.models.LanguageClientNameModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_naming_language_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @overload - def compatible_with_encoded_name( - self, body: _models.ClientNameAndJsonEncodedNameModel, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Required. - :type body: ~client.naming.models.ClientNameAndJsonEncodedNameModel - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def compatible_with_encoded_name( - self, body: JSON, *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def compatible_with_encoded_name( - self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def compatible_with_encoded_name( # pylint: disable=inconsistent-return-statements - self, body: Union[_models.ClientNameAndJsonEncodedNameModel, JSON, IO[bytes]], **kwargs: Any - ) -> None: - """compatible_with_encoded_name. - - :param body: Is one of the following types: ClientNameAndJsonEncodedNameModel, JSON, IO[bytes] - Required. - :type body: ~client.naming.models.ClientNameAndJsonEncodedNameModel or JSON or IO[bytes] - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_naming_compatible_with_encoded_name_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace - def request(self, *, client_name: str, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """request. - - :keyword client_name: Required. - :paramtype client_name: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_request_request( - client_name=client_name, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - @distributed_trace - def response(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements - """response. - - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[None] = kwargs.pop("cls", None) - - _request = build_naming_response_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - response_headers = {} - response_headers["default-name"] = self._deserialize("str", response.headers.get("default-name")) - - if cls: - return cls(pipeline_response, None, response_headers) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_patch.py b/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/operations/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/client-naming/client/naming/py.typed b/packages/typespec-python/test/azure/generated/client-naming/client/naming/py.typed deleted file mode 100644 index e5aff4f83af..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/client/naming/py.typed +++ /dev/null @@ -1 +0,0 @@ -# Marker file for PEP 561. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-naming/dev_requirements.txt b/packages/typespec-python/test/azure/generated/client-naming/dev_requirements.txt deleted file mode 100644 index 10548647144..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/dev_requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ --e ../../../tools/azure-sdk-tools -../../core/azure-core -aiohttp \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/conftest.py deleted file mode 100644 index e1548f36b47..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/conftest.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import os -import pytest -from dotenv import load_dotenv -from devtools_testutils import ( - test_proxy, - add_general_regex_sanitizer, - add_body_key_sanitizer, - add_header_regex_sanitizer, -) - -load_dotenv() - - -# For security, please avoid record sensitive identity information in recordings -@pytest.fixture(scope="session", autouse=True) -def add_sanitizers(test_proxy): - naming_subscription_id = os.environ.get("NAMING_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") - naming_tenant_id = os.environ.get("NAMING_TENANT_ID", "00000000-0000-0000-0000-000000000000") - naming_client_id = os.environ.get("NAMING_CLIENT_ID", "00000000-0000-0000-0000-000000000000") - naming_client_secret = os.environ.get("NAMING_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=naming_subscription_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=naming_tenant_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=naming_client_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=naming_client_secret, value="00000000-0000-0000-0000-000000000000") - - add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") - add_header_regex_sanitizer(key="Cookie", value="cookie;") - add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming.py deleted file mode 100644 index d61a3d6139f..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming.py +++ /dev/null @@ -1,86 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import NamingClientTestBase, NamingPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestNaming(NamingClientTestBase): - @NamingPreparer() - @recorded_by_proxy - def test_client_name(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.client_name() - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_parameter(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.parameter( - client_name="str", - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_client(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.client( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_language(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.language( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_compatible_with_encoded_name(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.compatible_with_encoded_name( - body={"wireName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_request(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.request( - client_name="str", - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_response(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.response() - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_async.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_async.py deleted file mode 100644 index 8e359563300..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_async.py +++ /dev/null @@ -1,87 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import NamingPreparer -from testpreparer_async import NamingClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestNamingAsync(NamingClientTestBaseAsync): - @NamingPreparer() - @recorded_by_proxy_async - async def test_client_name(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.client_name() - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_parameter(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.parameter( - client_name="str", - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_client(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.client( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_language(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.language( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_compatible_with_encoded_name(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.compatible_with_encoded_name( - body={"wireName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_request(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.request( - client_name="str", - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_response(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.response() - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_client_model_operations.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_client_model_operations.py deleted file mode 100644 index 854de9bc234..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_client_model_operations.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import NamingClientTestBase, NamingPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestNamingClientModelOperations(NamingClientTestBase): - @NamingPreparer() - @recorded_by_proxy - def test_client_model_client(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.client_model.client( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_client_model_language(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.client_model.language( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_client_model_operations_async.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_client_model_operations_async.py deleted file mode 100644 index ef1c0109021..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_client_model_operations_async.py +++ /dev/null @@ -1,36 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import NamingPreparer -from testpreparer_async import NamingClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestNamingClientModelOperationsAsync(NamingClientTestBaseAsync): - @NamingPreparer() - @recorded_by_proxy_async - async def test_client_model_client(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.client_model.client( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_client_model_language(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.client_model.language( - body={"defaultName": bool}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_union_enum_operations.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_union_enum_operations.py deleted file mode 100644 index 45e18f9ddc8..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_union_enum_operations.py +++ /dev/null @@ -1,37 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import NamingClientTestBase, NamingPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestNamingUnionEnumOperations(NamingClientTestBase): - @NamingPreparer() - @recorded_by_proxy - def test_union_enum_union_enum_name(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.union_enum.union_enum_name( - body="str", - content_type="str", - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy - def test_union_enum_union_enum_member_name(self, naming_endpoint): - client = self.create_client(endpoint=naming_endpoint) - response = client.union_enum.union_enum_member_name( - body="str", - content_type="str", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_union_enum_operations_async.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_union_enum_operations_async.py deleted file mode 100644 index 141e125b601..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/test_naming_union_enum_operations_async.py +++ /dev/null @@ -1,38 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import NamingPreparer -from testpreparer_async import NamingClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestNamingUnionEnumOperationsAsync(NamingClientTestBaseAsync): - @NamingPreparer() - @recorded_by_proxy_async - async def test_union_enum_union_enum_name(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.union_enum.union_enum_name( - body="str", - content_type="str", - ) - - # please add some check logic here by yourself - # ... - - @NamingPreparer() - @recorded_by_proxy_async - async def test_union_enum_union_enum_member_name(self, naming_endpoint): - client = self.create_async_client(endpoint=naming_endpoint) - response = await client.union_enum.union_enum_member_name( - body="str", - content_type="str", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/testpreparer.py deleted file mode 100644 index 0b6e8178c61..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/testpreparer.py +++ /dev/null @@ -1,24 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from client.naming import NamingClient -from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer -import functools - - -class NamingClientTestBase(AzureRecordedTestCase): - - def create_client(self, endpoint): - credential = self.get_credential(NamingClient) - return self.create_client_from_credential( - NamingClient, - credential=credential, - endpoint=endpoint, - ) - - -NamingPreparer = functools.partial(PowerShellPreparer, "naming", naming_endpoint="https://fake_naming_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/client-naming/generated_tests/testpreparer_async.py deleted file mode 100644 index f306afdbed6..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/generated_tests/testpreparer_async.py +++ /dev/null @@ -1,20 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from client.naming.aio import NamingClient -from devtools_testutils import AzureRecordedTestCase - - -class NamingClientTestBaseAsync(AzureRecordedTestCase): - - def create_async_client(self, endpoint): - credential = self.get_credential(NamingClient, is_async=True) - return self.create_client_from_credential( - NamingClient, - credential=credential, - endpoint=endpoint, - ) diff --git a/packages/typespec-python/test/azure/generated/client-naming/pyproject.toml b/packages/typespec-python/test/azure/generated/client-naming/pyproject.toml deleted file mode 100644 index 0082571e108..00000000000 --- a/packages/typespec-python/test/azure/generated/client-naming/pyproject.toml +++ /dev/null @@ -1,58 +0,0 @@ -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -[build-system] -requires = ["setuptools>=61.0.0", "wheel"] # Requires 61.0.0 for dynamic version -build-backend = "setuptools.build_meta" - -[project] -name = "client-naming" -authors = [ - { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, -] -description = "Microsoft Corporation Azure Client Naming Client Library for Python" -license = {text = "MIT License"} -classifiers = [ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: MIT License", -] -requires-python = ">=3.9" -keywords = ["azure", "azure sdk"] - -dependencies = [ - "isodate>=0.6.1", - "azure-core>=1.35.0", - "typing-extensions>=4.6.0", -] -dynamic = [ -"version", "readme" -] - -[project.urls] -repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" - -[tool.setuptools.dynamic] -version = {attr = "client.naming._version.VERSION"} -readme = {file = ["README.md"], content-type = "text/markdown"} - -[tool.setuptools.packages.find] -exclude = [ - "tests*", - "samples*", - "client", -] - -[tool.setuptools.package-data] -pytyped = ["py.typed"] diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/model_base.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/serialization.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/aio/operations/_operations.py index 34b01918790..fba484ac764 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: @@ -67,7 +67,7 @@ async def default(self, *, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -114,7 +114,7 @@ async def base64(self, *, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -161,7 +161,7 @@ async def base64_url(self, *, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -193,7 +193,7 @@ async def base64_url(self, *, value: bytes, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def base64_url_array(self, *, value: List[bytes], **kwargs: Any) -> None: + async def base64_url_array(self, *, value: list[bytes], **kwargs: Any) -> None: """base64_url_array. :keyword value: Required. @@ -208,7 +208,7 @@ async def base64_url_array(self, *, value: List[bytes], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/operations/_operations.py index db44a851263..6f3efe2d1f0 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/header/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -68,7 +68,7 @@ def build_header_base64_url_request(*, value: bytes, **kwargs: Any) -> HttpReque return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) -def build_header_base64_url_array_request(*, value: List[bytes], **kwargs: Any) -> HttpRequest: +def build_header_base64_url_array_request(*, value: list[bytes], **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) # Construct URL @@ -113,7 +113,7 @@ def default(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -160,7 +160,7 @@ def base64(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -207,7 +207,7 @@ def base64_url(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -240,7 +240,7 @@ def base64_url(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable @distributed_trace def base64_url_array( # pylint: disable=inconsistent-return-statements - self, *, value: List[bytes], **kwargs: Any + self, *, value: list[bytes], **kwargs: Any ) -> None: """base64_url_array. @@ -256,7 +256,7 @@ def base64_url_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py index 4cfac3fcf24..0be46258813 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, List, Mapping, overload +from typing import Any, Mapping, overload from .._utils.model_base import Model as _Model, rest_field @@ -47,14 +47,14 @@ class Base64urlArrayBytesProperty(_Model): :vartype value: list[bytes] """ - value: List[bytes] = rest_field(visibility=["read", "create", "update", "delete", "query"], format="base64url") + value: list[bytes] = rest_field(visibility=["read", "create", "update", "delete", "query"], format="base64url") """Required.""" @overload def __init__( self, *, - value: List[bytes], + value: list[bytes], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/aio/operations/_operations.py index 2ad2a620c35..d2236f4a974 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/aio/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -39,7 +39,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PropertyOperations: @@ -125,7 +125,7 @@ async def default( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -243,7 +243,7 @@ async def base64( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -361,7 +361,7 @@ async def base64_url( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -484,7 +484,7 @@ async def base64_url_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/operations/_operations.py index 85ad43969cc..e11545e176b 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/property/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -190,7 +190,7 @@ def default( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -308,7 +308,7 @@ def base64( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -426,7 +426,7 @@ def base64_url( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -549,7 +549,7 @@ def base64_url_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/aio/operations/_operations.py index ace97a6099c..6ed14f87ed1 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryOperations: @@ -67,7 +67,7 @@ async def default(self, *, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -114,7 +114,7 @@ async def base64(self, *, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -161,7 +161,7 @@ async def base64_url(self, *, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -193,7 +193,7 @@ async def base64_url(self, *, value: bytes, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def base64_url_array(self, *, value: List[bytes], **kwargs: Any) -> None: + async def base64_url_array(self, *, value: list[bytes], **kwargs: Any) -> None: """base64_url_array. :keyword value: Required. @@ -208,7 +208,7 @@ async def base64_url_array(self, *, value: List[bytes], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/operations/_operations.py index 9400dc2ad1c..21f04ac9841 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/query/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -68,7 +68,7 @@ def build_query_base64_url_request(*, value: bytes, **kwargs: Any) -> HttpReques return HttpRequest(method="GET", url=_url, params=_params, **kwargs) -def build_query_base64_url_array_request(*, value: List[bytes], **kwargs: Any) -> HttpRequest: +def build_query_base64_url_array_request(*, value: list[bytes], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -113,7 +113,7 @@ def default(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -160,7 +160,7 @@ def base64(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -207,7 +207,7 @@ def base64_url(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -240,7 +240,7 @@ def base64_url(self, *, value: bytes, **kwargs: Any) -> None: # pylint: disable @distributed_trace def base64_url_array( # pylint: disable=inconsistent-return-statements - self, *, value: List[bytes], **kwargs: Any + self, *, value: list[bytes], **kwargs: Any ) -> None: """base64_url_array. @@ -256,7 +256,7 @@ def base64_url_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/aio/operations/_operations.py index 1349671fdc7..f565a0463ac 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import json -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class RequestBodyOperations: @@ -71,7 +71,7 @@ async def default(self, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -122,7 +122,7 @@ async def octet_stream(self, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -173,7 +173,7 @@ async def custom_content_type(self, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -224,7 +224,7 @@ async def base64(self, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -275,7 +275,7 @@ async def base64_url(self, value: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/operations/_operations.py index cb82e8b6245..b8471b3f93f 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/requestbody/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import json -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -132,7 +132,7 @@ def default(self, value: bytes, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -183,7 +183,7 @@ def octet_stream(self, value: bytes, **kwargs: Any) -> None: # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -236,7 +236,7 @@ def custom_content_type( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -287,7 +287,7 @@ def base64(self, value: bytes, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -338,7 +338,7 @@ def base64_url(self, value: bytes, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/aio/operations/_operations.py index e9e3946e0ff..8081a1c7aa6 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterator, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ResponseBodyOperations: @@ -69,7 +69,7 @@ async def default(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -122,7 +122,7 @@ async def octet_stream(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -178,7 +178,7 @@ async def custom_content_type(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -234,7 +234,7 @@ async def base64(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -293,7 +293,7 @@ async def base64_url(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/operations/_operations.py index a8418a97e22..0a1f51c432c 100644 --- a/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-bytes/encode/bytes/responsebody/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Optional, TypeVar +from typing import Any, Callable, Iterator, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -136,7 +136,7 @@ def default(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -189,7 +189,7 @@ def octet_stream(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -245,7 +245,7 @@ def custom_content_type(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -301,7 +301,7 @@ def base64(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -360,7 +360,7 @@ def base64_url(self, **kwargs: Any) -> bytes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/model_base.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/serialization.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/aio/operations/_operations.py index 16b787ee17c..f84c62ed502 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: @@ -69,7 +69,7 @@ async def default(self, *, value: datetime.datetime, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -116,7 +116,7 @@ async def rfc3339(self, *, value: datetime.datetime, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def rfc7231(self, *, value: datetime.datetime, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -210,7 +210,7 @@ async def unix_timestamp(self, *, value: datetime.datetime, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -242,7 +242,7 @@ async def unix_timestamp(self, *, value: datetime.datetime, **kwargs: Any) -> No return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def unix_timestamp_array(self, *, value: List[datetime.datetime], **kwargs: Any) -> None: + async def unix_timestamp_array(self, *, value: list[datetime.datetime], **kwargs: Any) -> None: """unix_timestamp_array. :keyword value: Required. @@ -257,7 +257,7 @@ async def unix_timestamp_array(self, *, value: List[datetime.datetime], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/operations/_operations.py index d2c0a7c87b6..aad8683035b 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/header/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -82,7 +82,7 @@ def build_header_unix_timestamp_request(*, value: datetime.datetime, **kwargs: A def build_header_unix_timestamp_array_request( # pylint: disable=name-too-long - *, value: List[datetime.datetime], **kwargs: Any + *, value: list[datetime.datetime], **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -130,7 +130,7 @@ def default( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -179,7 +179,7 @@ def rfc3339( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -228,7 +228,7 @@ def rfc7231( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -277,7 +277,7 @@ def unix_timestamp( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -310,7 +310,7 @@ def unix_timestamp( # pylint: disable=inconsistent-return-statements @distributed_trace def unix_timestamp_array( # pylint: disable=inconsistent-return-statements - self, *, value: List[datetime.datetime], **kwargs: Any + self, *, value: list[datetime.datetime], **kwargs: Any ) -> None: """unix_timestamp_array. @@ -326,7 +326,7 @@ def unix_timestamp_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py index 97e77c136a0..934d8c13f82 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/models/_models.py @@ -8,7 +8,7 @@ # pylint: disable=useless-super-delegation import datetime -from typing import Any, List, Mapping, overload +from typing import Any, Mapping, overload from .._utils.model_base import Model as _Model, rest_field @@ -104,7 +104,7 @@ class UnixTimestampArrayDatetimeProperty(_Model): :vartype value: list[~datetime.datetime] """ - value: List[datetime.datetime] = rest_field( + value: list[datetime.datetime] = rest_field( visibility=["read", "create", "update", "delete", "query"], format="unix-timestamp" ) """Required.""" @@ -113,7 +113,7 @@ class UnixTimestampArrayDatetimeProperty(_Model): def __init__( self, *, - value: List[datetime.datetime], + value: list[datetime.datetime], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/aio/operations/_operations.py index 43602775b2a..7f9a4e01223 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/aio/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -40,7 +40,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PropertyOperations: @@ -126,7 +126,7 @@ async def default( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -244,7 +244,7 @@ async def rfc3339( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -362,7 +362,7 @@ async def rfc7231( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -485,7 +485,7 @@ async def unix_timestamp( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -612,7 +612,7 @@ async def unix_timestamp_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/operations/_operations.py index 255033a5cc6..06398b7a24f 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/property/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -207,7 +207,7 @@ def default( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -325,7 +325,7 @@ def rfc3339( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -443,7 +443,7 @@ def rfc7231( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -566,7 +566,7 @@ def unix_timestamp( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -693,7 +693,7 @@ def unix_timestamp_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/aio/operations/_operations.py index 5ff4fae9282..896b8107b09 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryOperations: @@ -69,7 +69,7 @@ async def default(self, *, value: datetime.datetime, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -116,7 +116,7 @@ async def rfc3339(self, *, value: datetime.datetime, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -163,7 +163,7 @@ async def rfc7231(self, *, value: datetime.datetime, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -210,7 +210,7 @@ async def unix_timestamp(self, *, value: datetime.datetime, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -242,7 +242,7 @@ async def unix_timestamp(self, *, value: datetime.datetime, **kwargs: Any) -> No return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def unix_timestamp_array(self, *, value: List[datetime.datetime], **kwargs: Any) -> None: + async def unix_timestamp_array(self, *, value: list[datetime.datetime], **kwargs: Any) -> None: """unix_timestamp_array. :keyword value: Required. @@ -257,7 +257,7 @@ async def unix_timestamp_array(self, *, value: List[datetime.datetime], **kwargs 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/operations/_operations.py index ac4771e163b..54b6daed69b 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/query/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -81,7 +81,7 @@ def build_query_unix_timestamp_request(*, value: datetime.datetime, **kwargs: An return HttpRequest(method="GET", url=_url, params=_params, **kwargs) -def build_query_unix_timestamp_array_request(*, value: List[datetime.datetime], **kwargs: Any) -> HttpRequest: +def build_query_unix_timestamp_array_request(*, value: list[datetime.datetime], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -128,7 +128,7 @@ def default( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -177,7 +177,7 @@ def rfc3339( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -226,7 +226,7 @@ def rfc7231( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -275,7 +275,7 @@ def unix_timestamp( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -308,7 +308,7 @@ def unix_timestamp( # pylint: disable=inconsistent-return-statements @distributed_trace def unix_timestamp_array( # pylint: disable=inconsistent-return-statements - self, *, value: List[datetime.datetime], **kwargs: Any + self, *, value: list[datetime.datetime], **kwargs: Any ) -> None: """unix_timestamp_array. @@ -324,7 +324,7 @@ def unix_timestamp_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/aio/operations/_operations.py index 80260c85a99..d36fb9910a9 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ResponseHeaderOperations: @@ -65,7 +65,7 @@ async def default(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -112,7 +112,7 @@ async def rfc3339(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -159,7 +159,7 @@ async def rfc7231(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -206,7 +206,7 @@ async def unix_timestamp(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/operations/_operations.py index eaffee0f8c1..9c3c8ae969d 100644 --- a/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-datetime/encode/datetime/responseheader/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -90,7 +90,7 @@ def default(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -137,7 +137,7 @@ def rfc3339(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -184,7 +184,7 @@ def rfc7231(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ def unix_timestamp(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/model_base.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/serialization.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py index b63b3ac963f..6606adc69a7 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/aio/operations/_operations.py @@ -10,7 +10,7 @@ import datetime from io import IOBase import json -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -54,7 +54,7 @@ from .._configuration import DurationClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] @@ -91,7 +91,7 @@ async def default(self, *, input: datetime.timedelta, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ async def iso8601(self, *, input: datetime.timedelta, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ async def int32_seconds(self, *, input: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -232,7 +232,7 @@ async def float_seconds(self, *, input: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -279,7 +279,7 @@ async def float64_seconds(self, *, input: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -311,7 +311,7 @@ async def float64_seconds(self, *, input: float, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def int32_seconds_array(self, *, input: List[int], **kwargs: Any) -> None: + async def int32_seconds_array(self, *, input: list[int], **kwargs: Any) -> None: """int32_seconds_array. :keyword input: Required. @@ -326,7 +326,7 @@ async def int32_seconds_array(self, *, input: List[int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -441,7 +441,7 @@ async def default( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -559,7 +559,7 @@ async def iso8601( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -682,7 +682,7 @@ async def int32_seconds( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -805,7 +805,7 @@ async def float_seconds( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -928,7 +928,7 @@ async def float64_seconds( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1051,7 +1051,7 @@ async def float_seconds_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1137,7 +1137,7 @@ async def default(self, *, duration: datetime.timedelta, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1184,7 +1184,7 @@ async def iso8601(self, *, duration: datetime.timedelta, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1216,7 +1216,7 @@ async def iso8601(self, *, duration: datetime.timedelta, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def iso8601_array(self, *, duration: List[datetime.timedelta], **kwargs: Any) -> None: + async def iso8601_array(self, *, duration: list[datetime.timedelta], **kwargs: Any) -> None: """iso8601_array. :keyword duration: Required. @@ -1231,7 +1231,7 @@ async def iso8601_array(self, *, duration: List[datetime.timedelta], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1278,7 +1278,7 @@ async def int32_seconds(self, *, duration: int, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1325,7 +1325,7 @@ async def float_seconds(self, *, duration: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1372,7 +1372,7 @@ async def float64_seconds(self, *, duration: float, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py index c73527be7e5..8615ef9d90b 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/models/_models.py @@ -8,7 +8,7 @@ # pylint: disable=useless-super-delegation import datetime -from typing import Any, List, Mapping, overload +from typing import Any, Mapping, overload from .._utils.model_base import Model as _Model, rest_field @@ -76,14 +76,14 @@ class FloatSecondsDurationArrayProperty(_Model): :vartype value: list[float] """ - value: List[float] = rest_field(visibility=["read", "create", "update", "delete", "query"]) + value: list[float] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required.""" @overload def __init__( self, *, - value: List[float], + value: list[float], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py index 122b0e91d5d..39ecbf9f91b 100644 --- a/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-duration/encode/duration/operations/_operations.py @@ -10,7 +10,7 @@ import datetime from io import IOBase import json -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] JSON = MutableMapping[str, Any] _SERIALIZER = Serializer() @@ -101,7 +101,7 @@ def build_query_float64_seconds_request(*, input: float, **kwargs: Any) -> HttpR return HttpRequest(method="GET", url=_url, params=_params, **kwargs) -def build_query_int32_seconds_array_request(*, input: List[int], **kwargs: Any) -> HttpRequest: +def build_query_int32_seconds_array_request(*, input: list[int], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -239,7 +239,7 @@ def build_header_iso8601_request(*, duration: datetime.timedelta, **kwargs: Any) return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) -def build_header_iso8601_array_request(*, duration: List[datetime.timedelta], **kwargs: Any) -> HttpRequest: +def build_header_iso8601_array_request(*, duration: list[datetime.timedelta], **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) # Construct URL @@ -322,7 +322,7 @@ def default( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -371,7 +371,7 @@ def iso8601( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -418,7 +418,7 @@ def int32_seconds(self, *, input: int, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -465,7 +465,7 @@ def float_seconds(self, *, input: float, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -512,7 +512,7 @@ def float64_seconds(self, *, input: float, **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -545,7 +545,7 @@ def float64_seconds(self, *, input: float, **kwargs: Any) -> None: # pylint: di @distributed_trace def int32_seconds_array( # pylint: disable=inconsistent-return-statements - self, *, input: List[int], **kwargs: Any + self, *, input: list[int], **kwargs: Any ) -> None: """int32_seconds_array. @@ -561,7 +561,7 @@ def int32_seconds_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -676,7 +676,7 @@ def default( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -794,7 +794,7 @@ def iso8601( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -917,7 +917,7 @@ def int32_seconds( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1040,7 +1040,7 @@ def float_seconds( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1163,7 +1163,7 @@ def float64_seconds( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1286,7 +1286,7 @@ def float_seconds_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1374,7 +1374,7 @@ def default( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1423,7 +1423,7 @@ def iso8601( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1456,7 +1456,7 @@ def iso8601( # pylint: disable=inconsistent-return-statements @distributed_trace def iso8601_array( # pylint: disable=inconsistent-return-statements - self, *, duration: List[datetime.timedelta], **kwargs: Any + self, *, duration: list[datetime.timedelta], **kwargs: Any ) -> None: """iso8601_array. @@ -1472,7 +1472,7 @@ def iso8601_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1519,7 +1519,7 @@ def int32_seconds(self, *, duration: int, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1568,7 +1568,7 @@ def float_seconds( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1617,7 +1617,7 @@ def float64_seconds( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/model_base.py b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/serialization.py b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/aio/operations/_operations.py index 541c4602bfa..c2131681965 100644 --- a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/aio/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -38,7 +38,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PropertyOperations: @@ -124,7 +124,7 @@ async def safeint_as_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -242,7 +242,7 @@ async def uint32_as_string_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -360,7 +360,7 @@ async def uint8_as_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/operations/_operations.py b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/operations/_operations.py index 95f46e07ff1..e177bdb9b4e 100644 --- a/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/encode-numeric/encode/numeric/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -173,7 +173,7 @@ def safeint_as_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -291,7 +291,7 @@ def uint32_as_string_optional( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -409,7 +409,7 @@ def uint8_as_string( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/model_base.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/serialization.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py index 41bf6ffa01d..9d11bf5b18a 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/aio/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] _Unset: Any = object() @@ -111,7 +111,7 @@ async def simple(self, body: Union[_models.User, JSON, IO[bytes]], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -229,7 +229,7 @@ async def simple(self, body: Union[JSON, IO[bytes]] = _Unset, *, name: str = _Un 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py index 341cafd611d..7ce42d22732 100644 --- a/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-basic/parameters/basic/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _Unset: Any = object() _SERIALIZER = Serializer() @@ -143,7 +143,7 @@ def simple( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -263,7 +263,7 @@ def simple( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_operations/_operations.py index 5fbde706d0d..527d901bd71 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ JSON = MutableMapping[str, Any] _Unset: Any = object() T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -133,7 +133,7 @@ def required_explicit( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -235,7 +235,7 @@ def required_implicit( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/model_base.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/serialization.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/_operations/_operations.py index 1bb829a72b4..a8832237bd2 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/aio/_operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -37,7 +37,7 @@ JSON = MutableMapping[str, Any] _Unset: Any = object() T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _BodyOptionalityClientOperationsMixin( @@ -106,7 +106,7 @@ async def required_explicit(self, body: Union[_models2.BodyModel, JSON, IO[bytes 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -210,7 +210,7 @@ async def required_implicit( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/aio/operations/_operations.py index 975d83a41c9..04637a79b8f 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/aio/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class OptionalExplicitOperations: @@ -114,7 +114,7 @@ async def set(self, body: Optional[Union[_models3.BodyModel, JSON, IO[bytes]]] = 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -219,7 +219,7 @@ async def omit(self, body: Optional[Union[_models3.BodyModel, JSON, IO[bytes]]] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/operations/_operations.py index 649652306b8..9f5626d6cd8 100644 --- a/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-body-optionality/parameters/bodyoptionality/optionalexplicit/operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -144,7 +144,7 @@ def set( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -249,7 +249,7 @@ def omit( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/model_base.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/serialization.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/aio/operations/_operations.py index e907b230781..b12ec7f3586 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ...operations._operations import build_header_csv_request T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class HeaderOperations: @@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def csv(self, *, colors: List[str], **kwargs: Any) -> None: + async def csv(self, *, colors: list[str], **kwargs: Any) -> None: """csv. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -62,7 +62,7 @@ async def csv(self, *, colors: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/operations/_operations.py index 0699a9bf861..1942cbc05f0 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/header/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,13 +26,13 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -def build_header_csv_request(*, colors: List[str], **kwargs: Any) -> HttpRequest: +def build_header_csv_request(*, colors: list[str], **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) # Construct URL @@ -62,7 +62,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def csv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def csv(self, *, colors: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """csv. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -77,7 +77,7 @@ def csv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/aio/operations/_operations.py index 4a14ab145fb..45c7c32ace8 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryOperations: @@ -52,7 +52,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def multi(self, *, colors: List[str], **kwargs: Any) -> None: + async def multi(self, *, colors: list[str], **kwargs: Any) -> None: """multi. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -67,7 +67,7 @@ async def multi(self, *, colors: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -99,7 +99,7 @@ async def multi(self, *, colors: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def ssv(self, *, colors: List[str], **kwargs: Any) -> None: + async def ssv(self, *, colors: list[str], **kwargs: Any) -> None: """ssv. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -114,7 +114,7 @@ async def ssv(self, *, colors: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -146,7 +146,7 @@ async def ssv(self, *, colors: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def pipes(self, *, colors: List[str], **kwargs: Any) -> None: + async def pipes(self, *, colors: list[str], **kwargs: Any) -> None: """pipes. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -161,7 +161,7 @@ async def pipes(self, *, colors: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -193,7 +193,7 @@ async def pipes(self, *, colors: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def csv(self, *, colors: List[str], **kwargs: Any) -> None: + async def csv(self, *, colors: list[str], **kwargs: Any) -> None: """csv. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -208,7 +208,7 @@ async def csv(self, *, colors: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/operations/_operations.py index ac12176c9e5..2ec0571b9d7 100644 --- a/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-collection-format/parameters/collectionformat/query/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,13 +26,13 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False -def build_query_multi_request(*, colors: List[str], **kwargs: Any) -> HttpRequest: +def build_query_multi_request(*, colors: list[str], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -44,7 +44,7 @@ def build_query_multi_request(*, colors: List[str], **kwargs: Any) -> HttpReques return HttpRequest(method="GET", url=_url, params=_params, **kwargs) -def build_query_ssv_request(*, colors: List[str], **kwargs: Any) -> HttpRequest: +def build_query_ssv_request(*, colors: list[str], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -56,7 +56,7 @@ def build_query_ssv_request(*, colors: List[str], **kwargs: Any) -> HttpRequest: return HttpRequest(method="GET", url=_url, params=_params, **kwargs) -def build_query_pipes_request(*, colors: List[str], **kwargs: Any) -> HttpRequest: +def build_query_pipes_request(*, colors: list[str], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -68,7 +68,7 @@ def build_query_pipes_request(*, colors: List[str], **kwargs: Any) -> HttpReques return HttpRequest(method="GET", url=_url, params=_params, **kwargs) -def build_query_csv_request(*, colors: List[str], **kwargs: Any) -> HttpRequest: +def build_query_csv_request(*, colors: list[str], **kwargs: Any) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) # Construct URL @@ -98,7 +98,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def multi(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def multi(self, *, colors: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """multi. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -113,7 +113,7 @@ def multi(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ def multi(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def ssv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def ssv(self, *, colors: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """ssv. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -160,7 +160,7 @@ def ssv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -192,7 +192,7 @@ def ssv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=i return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def pipes(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def pipes(self, *, colors: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """pipes. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -207,7 +207,7 @@ def pipes(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -239,7 +239,7 @@ def pipes(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def csv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def csv(self, *, colors: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """csv. :keyword colors: Possible values for colors are [blue,red,green]. Required. @@ -254,7 +254,7 @@ def csv(self, *, colors: List[str], **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py index 3c8c6de47f9..acba2cac073 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -74,7 +74,7 @@ def normal(self, name: str, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -123,7 +123,7 @@ def optional( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/model_base.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/serialization.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py index a6e1efd304e..60847cf42ee 100644 --- a/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-path/parameters/path/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import PathClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _PathClientOperationsMixin( @@ -50,7 +50,7 @@ async def normal(self, name: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -97,7 +97,7 @@ async def optional(self, *, name: Optional[str] = None, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/model_base.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/serialization.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py index 0a687e5efe2..82fa3056a5e 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/aio/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -45,7 +45,7 @@ JSON = MutableMapping[str, Any] _Unset: Any = object() T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ModelOperations: @@ -131,7 +131,7 @@ async def spread_as_request_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -242,7 +242,7 @@ async def spread_composite_request_only_with_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -300,7 +300,7 @@ async def spread_composite_request_without_body(self, name: str, *, test_header: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -420,7 +420,7 @@ async def spread_composite_request( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -546,7 +546,7 @@ async def spread_composite_request_mix( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -677,7 +677,7 @@ async def spread_as_request_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -812,7 +812,7 @@ async def spread_parameter_with_inner_model( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -949,7 +949,7 @@ async def spread_as_request_parameter( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1003,10 +1003,10 @@ async def spread_with_multiple_parameters( *, x_ms_test_header: str, required_string: str, - required_int_list: List[int], + required_int_list: list[int], content_type: str = "application/json", optional_int: Optional[int] = None, - optional_string_list: Optional[List[str]] = None, + optional_string_list: Optional[list[str]] = None, **kwargs: Any ) -> None: """spread_with_multiple_parameters. @@ -1079,9 +1079,9 @@ async def spread_with_multiple_parameters( *, x_ms_test_header: str, required_string: str = _Unset, - required_int_list: List[int] = _Unset, + required_int_list: list[int] = _Unset, optional_int: Optional[int] = None, - optional_string_list: Optional[List[str]] = None, + optional_string_list: Optional[list[str]] = None, **kwargs: Any ) -> None: """spread_with_multiple_parameters. @@ -1110,7 +1110,7 @@ async def spread_with_multiple_parameters( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1266,7 +1266,7 @@ async def spread_parameter_with_inner_alias( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py index 0df7195f40f..6d70b50e6a0 100644 --- a/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/parameters-spread/parameters/spread/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -33,7 +33,7 @@ JSON = MutableMapping[str, Any] _Unset: Any = object() T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -313,7 +313,7 @@ def spread_as_request_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -424,7 +424,7 @@ def spread_composite_request_only_with_body( # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -484,7 +484,7 @@ def spread_composite_request_without_body( # pylint: disable=inconsistent-retur 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -604,7 +604,7 @@ def spread_composite_request( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -730,7 +730,7 @@ def spread_composite_request_mix( # pylint: disable=inconsistent-return-stateme 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -857,7 +857,7 @@ def spread_as_request_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -992,7 +992,7 @@ def spread_parameter_with_inner_model( # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1129,7 +1129,7 @@ def spread_as_request_parameter( # pylint: disable=inconsistent-return-statemen 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1183,10 +1183,10 @@ def spread_with_multiple_parameters( *, x_ms_test_header: str, required_string: str, - required_int_list: List[int], + required_int_list: list[int], content_type: str = "application/json", optional_int: Optional[int] = None, - optional_string_list: Optional[List[str]] = None, + optional_string_list: Optional[list[str]] = None, **kwargs: Any, ) -> None: """spread_with_multiple_parameters. @@ -1259,9 +1259,9 @@ def spread_with_multiple_parameters( # pylint: disable=inconsistent-return-stat *, x_ms_test_header: str, required_string: str = _Unset, - required_int_list: List[int] = _Unset, + required_int_list: list[int] = _Unset, optional_int: Optional[int] = None, - optional_string_list: Optional[List[str]] = None, + optional_string_list: Optional[list[str]] = None, **kwargs: Any, ) -> None: """spread_with_multiple_parameters. @@ -1290,7 +1290,7 @@ def spread_with_multiple_parameters( # pylint: disable=inconsistent-return-stat 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1446,7 +1446,7 @@ def spread_parameter_with_inner_alias( # pylint: disable=inconsistent-return-st 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/model_base.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/serialization.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py index 56c23d1b46a..d5f3f9a1373 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Literal, Optional, TypeVar +from typing import Any, AsyncIterator, Callable, Literal, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ from .._configuration import ContentNegotiationClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SameBodyOperations: @@ -70,7 +70,7 @@ async def get_avatar_as_png(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -128,7 +128,7 @@ async def get_avatar_as_jpeg(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -204,7 +204,7 @@ async def get_avatar_as_png(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -262,7 +262,7 @@ async def get_avatar_as_json(self, **kwargs: Any) -> _models.PngImageAsJson: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py index 682baa6b64d..1fe8f7fb6f0 100644 --- a/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-content-negotiation/payload/contentnegotiation/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Literal, Optional, TypeVar +from typing import Any, Callable, Iterator, Literal, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -119,7 +119,7 @@ def get_avatar_as_png(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -177,7 +177,7 @@ def get_avatar_as_jpeg(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -253,7 +253,7 @@ def get_avatar_as_png(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -311,7 +311,7 @@ def get_avatar_as_json(self, **kwargs: Any) -> _models.PngImageAsJson: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py index 7ab1942cc84..34b5942a8b0 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_operations/_operations.py @@ -8,7 +8,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -159,7 +159,7 @@ def create_resource(self, body: Union[_models.Resource, JSON, IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -275,7 +275,7 @@ def update_resource(self, body: Union[_models.ResourcePatch, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -398,7 +398,7 @@ def update_optional_resource( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/model_base.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/serialization.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py index 983828a683e..311c5b4345a 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/aio/_operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -39,7 +39,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _JsonMergePatchClientOperationsMixin( @@ -110,7 +110,7 @@ async def create_resource(self, body: Union[_models.Resource, JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -228,7 +228,7 @@ async def update_resource( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -351,7 +351,7 @@ async def update_optional_resource( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py index 11d83f5e8b4..128c9eefd51 100644 --- a/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-json-merge-patch/payload/jsonmergepatch/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, Dict, List, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from .._utils.model_base import Model as _Model, rest_field @@ -70,10 +70,10 @@ class Resource(_Model): name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required.""" description: Optional[str] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - map: Optional[Dict[str, "_models.InnerModel"]] = rest_field( + map: Optional[dict[str, "_models.InnerModel"]] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) - array: Optional[List["_models.InnerModel"]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) + array: Optional[list["_models.InnerModel"]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) int_value: Optional[int] = rest_field(name="intValue", visibility=["read", "create", "update", "delete", "query"]) float_value: Optional[float] = rest_field( name="floatValue", visibility=["read", "create", "update", "delete", "query"] @@ -81,7 +81,7 @@ class Resource(_Model): inner_model: Optional["_models.InnerModel"] = rest_field( name="innerModel", visibility=["read", "create", "update", "delete", "query"] ) - int_array: Optional[List[int]] = rest_field( + int_array: Optional[list[int]] = rest_field( name="intArray", visibility=["read", "create", "update", "delete", "query"] ) @@ -91,12 +91,12 @@ def __init__( *, name: str, description: Optional[str] = None, - map: Optional[Dict[str, "_models.InnerModel"]] = None, - array: Optional[List["_models.InnerModel"]] = None, + map: Optional[dict[str, "_models.InnerModel"]] = None, + array: Optional[list["_models.InnerModel"]] = None, int_value: Optional[int] = None, float_value: Optional[float] = None, inner_model: Optional["_models.InnerModel"] = None, - int_array: Optional[List[int]] = None, + int_array: Optional[list[int]] = None, ) -> None: ... @overload @@ -130,10 +130,10 @@ class ResourcePatch(_Model): """ description: Optional[str] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - map: Optional[Dict[str, "_models.InnerModel"]] = rest_field( + map: Optional[dict[str, "_models.InnerModel"]] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) - array: Optional[List["_models.InnerModel"]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) + array: Optional[list["_models.InnerModel"]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) int_value: Optional[int] = rest_field(name="intValue", visibility=["read", "create", "update", "delete", "query"]) float_value: Optional[float] = rest_field( name="floatValue", visibility=["read", "create", "update", "delete", "query"] @@ -141,7 +141,7 @@ class ResourcePatch(_Model): inner_model: Optional["_models.InnerModel"] = rest_field( name="innerModel", visibility=["read", "create", "update", "delete", "query"] ) - int_array: Optional[List[int]] = rest_field( + int_array: Optional[list[int]] = rest_field( name="intArray", visibility=["read", "create", "update", "delete", "query"] ) @@ -150,12 +150,12 @@ def __init__( self, *, description: Optional[str] = None, - map: Optional[Dict[str, "_models.InnerModel"]] = None, - array: Optional[List["_models.InnerModel"]] = None, + map: Optional[dict[str, "_models.InnerModel"]] = None, + array: Optional[list["_models.InnerModel"]] = None, int_value: Optional[int] = None, float_value: Optional[float] = None, inner_model: Optional["_models.InnerModel"] = None, - int_array: Optional[List[int]] = None, + int_array: Optional[list[int]] = None, ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/model_base.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/serialization.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/aio/operations/_operations.py index bf6e2f7acbf..958dc3f4e9a 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/aio/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import json -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -36,7 +36,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class StringBodyOperations: @@ -72,7 +72,7 @@ async def send_as_text(self, text: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -121,7 +121,7 @@ async def get_as_text(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -182,7 +182,7 @@ async def send_as_json(self, text: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -231,7 +231,7 @@ async def get_as_json(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/operations/_operations.py index be8974c8940..49c5a8a6082 100644 --- a/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-media-type/payload/mediatype/stringbody/operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import json -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -123,7 +123,7 @@ def send_as_text(self, text: str, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -172,7 +172,7 @@ def get_as_text(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ def send_as_json(self, text: str, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -282,7 +282,7 @@ def get_as_json(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/model_base.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/serialization.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/utils.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/utils.py index 34c2f1082c5..e98db3239df 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/utils.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_utils/utils.py @@ -6,7 +6,7 @@ # -------------------------------------------------------------------------- import json -from typing import Any, Dict, IO, List, Mapping, Optional, Tuple, Union +from typing import Any, IO, Mapping, Optional, Union from .._utils.model_base import Model, SdkJSONEncoder @@ -18,9 +18,9 @@ # file (or bytes) FileContent, # (filename, file (or bytes)) - Tuple[Optional[str], FileContent], + tuple[Optional[str], FileContent], # (filename, file (or bytes), content_type) - Tuple[Optional[str], FileContent, Optional[str]], + tuple[Optional[str], FileContent, Optional[str]], ] @@ -31,10 +31,10 @@ def serialize_multipart_data_entry(data_entry: Any) -> Any: def prepare_multipart_form_data( - body: Mapping[str, Any], multipart_fields: List[str], data_fields: List[str] -) -> Tuple[List[FileType], Dict[str, Any]]: - files: List[FileType] = [] - data: Dict[str, Any] = {} + body: Mapping[str, Any], multipart_fields: list[str], data_fields: list[str] +) -> tuple[list[FileType], dict[str, Any]]: + files: list[FileType] = [] + data: dict[str, Any] = {} for multipart_field in multipart_fields: multipart_entry = body.get(multipart_field) if isinstance(multipart_entry, list): diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py index de42c33ab22..8231c5a8983 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -44,7 +44,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class FormDataOperations: @@ -104,7 +104,7 @@ async def basic(self, body: Union[_models.MultiPartRequest, JSON], **kwargs: Any 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -112,8 +112,8 @@ async def basic(self, body: Union[_models.MultiPartRequest, JSON], **kwargs: Any cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = ["id"] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = ["id"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_basic_request( @@ -179,7 +179,7 @@ async def file_array_and_basic(self, body: Union[_models.ComplexPartsRequest, JS 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -187,8 +187,8 @@ async def file_array_and_basic(self, body: Union[_models.ComplexPartsRequest, JS cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage", "pictures"] - _data_fields: List[str] = ["id", "address"] + _file_fields: list[str] = ["profileImage", "pictures"] + _data_fields: list[str] = ["id", "address"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_file_array_and_basic_request( @@ -254,7 +254,7 @@ async def json_part(self, body: Union[_models.JsonPartRequest, JSON], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -262,8 +262,8 @@ async def json_part(self, body: Union[_models.JsonPartRequest, JSON], **kwargs: cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = ["address"] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = ["address"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_json_part_request( @@ -329,7 +329,7 @@ async def binary_array_parts(self, body: Union[_models.BinaryArrayPartsRequest, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -337,8 +337,8 @@ async def binary_array_parts(self, body: Union[_models.BinaryArrayPartsRequest, cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["pictures"] - _data_fields: List[str] = ["id"] + _file_fields: list[str] = ["pictures"] + _data_fields: list[str] = ["id"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_binary_array_parts_request( @@ -404,7 +404,7 @@ async def multi_binary_parts(self, body: Union[_models.MultiBinaryPartsRequest, 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -412,8 +412,8 @@ async def multi_binary_parts(self, body: Union[_models.MultiBinaryPartsRequest, cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage", "picture"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage", "picture"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_multi_binary_parts_request( @@ -481,7 +481,7 @@ async def check_file_name_and_content_type( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -489,8 +489,8 @@ async def check_file_name_and_content_type( cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = ["id"] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = ["id"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_check_file_name_and_content_type_request( @@ -556,7 +556,7 @@ async def anonymous_model(self, body: Union[_models.AnonymousModelRequest, JSON] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -564,8 +564,8 @@ async def anonymous_model(self, body: Union[_models.AnonymousModelRequest, JSON] cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_anonymous_model_request( @@ -658,7 +658,7 @@ async def json_array_and_file_array( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -666,8 +666,8 @@ async def json_array_and_file_array( cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage", "pictures"] - _data_fields: List[str] = ["id", "address", "previousAddresses"] + _file_fields: list[str] = ["profileImage", "pictures"] + _data_fields: list[str] = ["id", "address", "previousAddresses"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_json_array_and_file_array_request( @@ -756,7 +756,7 @@ async def image_jpeg_content_type( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -764,8 +764,8 @@ async def image_jpeg_content_type( cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_content_type_image_jpeg_content_type_request( @@ -836,7 +836,7 @@ async def required_content_type( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -844,8 +844,8 @@ async def required_content_type( cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_content_type_required_content_type_request( @@ -916,7 +916,7 @@ async def optional_content_type( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -924,8 +924,8 @@ async def optional_content_type( cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_content_type_optional_content_type_request( @@ -1009,7 +1009,7 @@ async def float(self, body: Union[_models.FloatRequest, JSON], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1017,8 +1017,8 @@ async def float(self, body: Union[_models.FloatRequest, JSON], **kwargs: Any) -> cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = [] - _data_fields: List[str] = ["temperature"] + _file_fields: list[str] = [] + _data_fields: list[str] = ["temperature"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_non_string_float_request( diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py index 8a6083c3ead..f18ec330312 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from .._utils.model_base import Model as _Model, rest_field from .._utils.utils import FileType @@ -85,7 +85,7 @@ class BinaryArrayPartsRequest(_Model): id: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required.""" - pictures: List[FileType] = rest_field( + pictures: list[FileType] = rest_field( visibility=["read", "create", "update", "delete", "query"], is_multipart_file_input=True ) """Required.""" @@ -95,7 +95,7 @@ def __init__( self, *, id: str, # pylint: disable=redefined-builtin - pictures: List[FileType], + pictures: list[FileType], ) -> None: ... @overload @@ -132,11 +132,11 @@ class ComplexHttpPartsModelRequest(_Model): name="profileImage", visibility=["read", "create", "update", "delete", "query"], is_multipart_file_input=True ) """Required.""" - previous_addresses: List["_models.Address"] = rest_field( + previous_addresses: list["_models.Address"] = rest_field( name="previousAddresses", visibility=["read", "create", "update", "delete", "query"] ) """Required.""" - pictures: List[FileType] = rest_field( + pictures: list[FileType] = rest_field( visibility=["read", "create", "update", "delete", "query"], is_multipart_file_input=True ) """Required.""" @@ -148,8 +148,8 @@ def __init__( id: str, # pylint: disable=redefined-builtin address: "_models.Address", profile_image: FileType, - previous_addresses: List["_models.Address"], - pictures: List[FileType], + previous_addresses: list["_models.Address"], + pictures: list[FileType], ) -> None: ... @overload @@ -184,7 +184,7 @@ class ComplexPartsRequest(_Model): name="profileImage", visibility=["read", "create", "update", "delete", "query"], is_multipart_file_input=True ) """Required.""" - pictures: List[FileType] = rest_field( + pictures: list[FileType] = rest_field( visibility=["read", "create", "update", "delete", "query"], is_multipart_file_input=True ) """Required.""" @@ -196,7 +196,7 @@ def __init__( id: str, # pylint: disable=redefined-builtin address: "_models.Address", profile_image: FileType, - pictures: List[FileType], + pictures: list[FileType], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py index ef176ba1fa9..a147c066502 100644 --- a/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -214,7 +214,7 @@ def basic( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -222,8 +222,8 @@ def basic( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = ["id"] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = ["id"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_basic_request( @@ -291,7 +291,7 @@ def file_array_and_basic( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -299,8 +299,8 @@ def file_array_and_basic( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage", "pictures"] - _data_fields: List[str] = ["id", "address"] + _file_fields: list[str] = ["profileImage", "pictures"] + _data_fields: list[str] = ["id", "address"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_file_array_and_basic_request( @@ -368,7 +368,7 @@ def json_part( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -376,8 +376,8 @@ def json_part( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = ["address"] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = ["address"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_json_part_request( @@ -445,7 +445,7 @@ def binary_array_parts( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -453,8 +453,8 @@ def binary_array_parts( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["pictures"] - _data_fields: List[str] = ["id"] + _file_fields: list[str] = ["pictures"] + _data_fields: list[str] = ["id"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_binary_array_parts_request( @@ -522,7 +522,7 @@ def multi_binary_parts( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -530,8 +530,8 @@ def multi_binary_parts( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage", "picture"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage", "picture"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_multi_binary_parts_request( @@ -599,7 +599,7 @@ def check_file_name_and_content_type( # pylint: disable=inconsistent-return-sta 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -607,8 +607,8 @@ def check_file_name_and_content_type( # pylint: disable=inconsistent-return-sta cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = ["id"] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = ["id"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_check_file_name_and_content_type_request( @@ -676,7 +676,7 @@ def anonymous_model( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -684,8 +684,8 @@ def anonymous_model( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_anonymous_model_request( @@ -778,7 +778,7 @@ def json_array_and_file_array( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -786,8 +786,8 @@ def json_array_and_file_array( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage", "pictures"] - _data_fields: List[str] = ["id", "address", "previousAddresses"] + _file_fields: list[str] = ["profileImage", "pictures"] + _data_fields: list[str] = ["id", "address", "previousAddresses"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_json_array_and_file_array_request( @@ -874,7 +874,7 @@ def image_jpeg_content_type( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -882,8 +882,8 @@ def image_jpeg_content_type( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_content_type_image_jpeg_content_type_request( @@ -952,7 +952,7 @@ def required_content_type( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -960,8 +960,8 @@ def required_content_type( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_content_type_required_content_type_request( @@ -1030,7 +1030,7 @@ def optional_content_type( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1038,8 +1038,8 @@ def optional_content_type( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = ["profileImage"] - _data_fields: List[str] = [] + _file_fields: list[str] = ["profileImage"] + _data_fields: list[str] = [] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_content_type_optional_content_type_request( @@ -1125,7 +1125,7 @@ def float( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1133,8 +1133,8 @@ def float( # pylint: disable=inconsistent-return-statements cls: ClsType[None] = kwargs.pop("cls", None) _body = body.as_dict() if isinstance(body, _Model) else body - _file_fields: List[str] = [] - _data_fields: List[str] = ["temperature"] + _file_fields: list[str] = [] + _data_fields: list[str] = ["temperature"] _files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields) _request = build_form_data_http_parts_non_string_float_request( diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/model_base.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/serialization.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py index 6747ac62eb2..e2d897f64f9 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -33,7 +33,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ServerDrivenPaginationOperations: @@ -68,7 +68,7 @@ def link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -76,7 +76,7 @@ def link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -105,7 +105,7 @@ def prepare_request(next_link=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("next") or None, AsyncList(list_of_elem) @@ -138,7 +138,7 @@ def nested_link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -146,7 +146,7 @@ def nested_link(self, **kwargs: Any) -> AsyncItemPaged["_models3.Pet"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -175,7 +175,7 @@ def prepare_request(next_link=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("nestedItems", {}).get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("nestedItems", {}).get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nestedNext.next") or None, AsyncList(list_of_elem) diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py index 2f24a83e6b1..08666551605 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.async_paging import AsyncItemPaged, AsyncList @@ -36,7 +36,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ServerDrivenPaginationContinuationTokenOperations: # pylint: disable=name-too-long @@ -73,7 +73,7 @@ def request_query_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models4.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models4.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -81,7 +81,7 @@ def request_query_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -100,7 +100,7 @@ def prepare_request(_continuation_token=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models4.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models4.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextToken") or None, AsyncList(list_of_elem) @@ -139,7 +139,7 @@ def request_header_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models4.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models4.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -147,7 +147,7 @@ def request_header_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -166,7 +166,7 @@ def prepare_request(_continuation_token=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models4.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models4.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextToken") or None, AsyncList(list_of_elem) @@ -205,7 +205,7 @@ def request_query_response_header( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models4.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models4.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -213,7 +213,7 @@ def request_query_response_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -232,7 +232,7 @@ def prepare_request(_continuation_token=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models4.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models4.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return pipeline_response.http_response.headers.get("next-token") or None, AsyncList(list_of_elem) @@ -271,7 +271,7 @@ def request_header_response_header( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models4.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models4.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -279,7 +279,7 @@ def request_header_response_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -298,7 +298,7 @@ def prepare_request(_continuation_token=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models4.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models4.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return pipeline_response.http_response.headers.get("next-token") or None, AsyncList(list_of_elem) @@ -337,7 +337,7 @@ def request_query_nested_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models4.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models4.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -345,7 +345,7 @@ def request_query_nested_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -364,7 +364,7 @@ def prepare_request(_continuation_token=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models4.Pet], deserialized.get("nestedItems", {}).get("pets", [])) + list_of_elem = _deserialize(list[_models4.Pet], deserialized.get("nestedItems", {}).get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nestedNext", {}).get("nextToken") or None, AsyncList(list_of_elem) @@ -403,7 +403,7 @@ def request_header_nested_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models4.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models4.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -411,7 +411,7 @@ def request_header_nested_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -430,7 +430,7 @@ def prepare_request(_continuation_token=None): async def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models4.Pet], deserialized.get("nestedItems", {}).get("pets", [])) + list_of_elem = _deserialize(list[_models4.Pet], deserialized.get("nestedItems", {}).get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nestedNext", {}).get("nextToken") or None, AsyncList(list_of_elem) diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/models/_models.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/models/_models.py index 90e8c993355..a46bbac8f95 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from ...._utils.model_base import Model as _Model, rest_field @@ -22,14 +22,14 @@ class RequestHeaderNestedResponseBodyResponseNestedItems(_Model): # pylint: dis :vartype pets: list[~payload.pageable.models.Pet] """ - pets: List["_models3.Pet"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) + pets: list["_models3.Pet"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required.""" @overload def __init__( self, *, - pets: List["_models3.Pet"], + pets: list["_models3.Pet"], ) -> None: ... @overload @@ -77,14 +77,14 @@ class RequestQueryNestedResponseBodyResponseNestedItems(_Model): # pylint: disa :vartype pets: list[~payload.pageable.models.Pet] """ - pets: List["_models3.Pet"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) + pets: list["_models3.Pet"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required.""" @overload def __init__( self, *, - pets: List["_models3.Pet"], + pets: list["_models3.Pet"], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py index bce974241d9..edd9c72c42b 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/continuationtoken/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from ...._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -220,7 +220,7 @@ def request_query_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -228,7 +228,7 @@ def request_query_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -247,7 +247,7 @@ def prepare_request(_continuation_token=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextToken") or None, iter(list_of_elem) @@ -286,7 +286,7 @@ def request_header_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -294,7 +294,7 @@ def request_header_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -313,7 +313,7 @@ def prepare_request(_continuation_token=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nextToken") or None, iter(list_of_elem) @@ -352,7 +352,7 @@ def request_query_response_header( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -360,7 +360,7 @@ def request_query_response_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -379,7 +379,7 @@ def prepare_request(_continuation_token=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return pipeline_response.http_response.headers.get("next-token") or None, iter(list_of_elem) @@ -418,7 +418,7 @@ def request_header_response_header( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -426,7 +426,7 @@ def request_header_response_header( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -445,7 +445,7 @@ def prepare_request(_continuation_token=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return pipeline_response.http_response.headers.get("next-token") or None, iter(list_of_elem) @@ -484,7 +484,7 @@ def request_query_nested_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -492,7 +492,7 @@ def request_query_nested_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -511,7 +511,7 @@ def prepare_request(_continuation_token=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("nestedItems", {}).get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("nestedItems", {}).get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nestedNext", {}).get("nextToken") or None, iter(list_of_elem) @@ -550,7 +550,7 @@ def request_header_nested_response_body( _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models3.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models3.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -558,7 +558,7 @@ def request_header_nested_response_body( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(_continuation_token=None): @@ -577,7 +577,7 @@ def prepare_request(_continuation_token=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models3.Pet], deserialized.get("nestedItems", {}).get("pets", [])) + list_of_elem = _deserialize(list[_models3.Pet], deserialized.get("nestedItems", {}).get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nestedNext", {}).get("nextToken") or None, iter(list_of_elem) diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/models/_models.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/models/_models.py index 7ee18c6226e..7e6db600655 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from ..._utils.model_base import Model as _Model, rest_field @@ -22,14 +22,14 @@ class NestedLinkResponseNestedItems(_Model): :vartype pets: list[~payload.pageable.models.Pet] """ - pets: List["_models2.Pet"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) + pets: list["_models2.Pet"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required.""" @overload def __init__( self, *, - pets: List["_models2.Pet"], + pets: list["_models2.Pet"], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py index b5cefa80f4b..15db6e6657e 100644 --- a/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-pageable/payload/pageable/serverdrivenpagination/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from ..continuationtoken.operations._operations import ServerDrivenPaginationContinuationTokenOperations T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -96,7 +96,7 @@ def link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models2.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models2.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -104,7 +104,7 @@ def link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -133,7 +133,7 @@ def prepare_request(next_link=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models2.Pet], deserialized.get("pets", [])) + list_of_elem = _deserialize(list[_models2.Pet], deserialized.get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("next") or None, iter(list_of_elem) @@ -166,7 +166,7 @@ def nested_link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models2.Pet]] = kwargs.pop("cls", None) + cls: ClsType[list[_models2.Pet]] = kwargs.pop("cls", None) error_map: MutableMapping = { 401: ClientAuthenticationError, @@ -174,7 +174,7 @@ def nested_link(self, **kwargs: Any) -> ItemPaged["_models2.Pet"]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} def prepare_request(next_link=None): if not next_link: @@ -203,7 +203,7 @@ def prepare_request(next_link=None): def extract_data(pipeline_response): deserialized = pipeline_response.http_response.json() - list_of_elem = _deserialize(List[_models2.Pet], deserialized.get("nestedItems", {}).get("pets", [])) + list_of_elem = _deserialize(list[_models2.Pet], deserialized.get("nestedItems", {}).get("pets", [])) if cls: list_of_elem = cls(list_of_elem) # type: ignore return deserialized.get("nestedNext.next") or None, iter(list_of_elem) diff --git a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/model_base.py b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/serialization.py b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/aio/operations/_operations.py index 1155ae7e712..1d5b903edb3 100644 --- a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -57,7 +57,7 @@ from .._configuration import XmlClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class SimpleModelValueOperations: @@ -91,7 +91,7 @@ async def get(self, **kwargs: Any) -> _models.SimpleModel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -152,7 +152,7 @@ async def put(self, input: _models.SimpleModel, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -219,7 +219,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithSimpleArrays: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -280,7 +280,7 @@ async def put(self, input: _models.ModelWithSimpleArrays, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithArrayOfModel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -408,7 +408,7 @@ async def put(self, input: _models.ModelWithArrayOfModel, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -475,7 +475,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithOptionalField: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -536,7 +536,7 @@ async def put(self, input: _models.ModelWithOptionalField, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -603,7 +603,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithAttributes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -664,7 +664,7 @@ async def put(self, input: _models.ModelWithAttributes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -731,7 +731,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithUnwrappedArray: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -792,7 +792,7 @@ async def put(self, input: _models.ModelWithUnwrappedArray, **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -859,7 +859,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithRenamedArrays: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -920,7 +920,7 @@ async def put(self, input: _models.ModelWithRenamedArrays, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -987,7 +987,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithRenamedFields: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1048,7 +1048,7 @@ async def put(self, input: _models.ModelWithRenamedFields, **kwargs: Any) -> Non 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1115,7 +1115,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithEmptyArray: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1176,7 +1176,7 @@ async def put(self, input: _models.ModelWithEmptyArray, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1243,7 +1243,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithText: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1304,7 +1304,7 @@ async def put(self, input: _models.ModelWithText, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1371,7 +1371,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithDictionary: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1432,7 +1432,7 @@ async def put(self, input: _models.ModelWithDictionary, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1499,7 +1499,7 @@ async def get(self, **kwargs: Any) -> _models.ModelWithEncodedNames: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1560,7 +1560,7 @@ async def put(self, input: _models.ModelWithEncodedNames, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/models/_models.py b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/models/_models.py index e6b4f8c75b8..971846ee186 100644 --- a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/models/_models.py +++ b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, Dict, List, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from .._utils.model_base import Model as _Model, rest_field @@ -22,7 +22,7 @@ class ModelWithArrayOfModel(_Model): :vartype items_property: ~payload.xml.models.SimpleModel """ - items_property: List["_models.SimpleModel"] = rest_field( + items_property: list["_models.SimpleModel"] = rest_field( name="items", visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "SimpleModel", "name": "items", "text": False, "unwrapped": False}, @@ -35,7 +35,7 @@ class ModelWithArrayOfModel(_Model): def __init__( self, *, - items_property: List["_models.SimpleModel"], + items_property: list["_models.SimpleModel"], ) -> None: ... @overload @@ -105,7 +105,7 @@ class ModelWithDictionary(_Model): :vartype metadata: dict[str, str] """ - metadata: Dict[str, str] = rest_field( + metadata: dict[str, str] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "name": "metadata", "text": False, "unwrapped": False}, ) @@ -117,7 +117,7 @@ class ModelWithDictionary(_Model): def __init__( self, *, - metadata: Dict[str, str], + metadata: dict[str, str], ) -> None: ... @overload @@ -138,7 +138,7 @@ class ModelWithEmptyArray(_Model): :vartype items_property: ~payload.xml.models.SimpleModel """ - items_property: List["_models.SimpleModel"] = rest_field( + items_property: list["_models.SimpleModel"] = rest_field( name="items", visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "SimpleModel", "name": "items", "text": False, "unwrapped": False}, @@ -151,7 +151,7 @@ class ModelWithEmptyArray(_Model): def __init__( self, *, - items_property: List["_models.SimpleModel"], + items_property: list["_models.SimpleModel"], ) -> None: ... @overload @@ -180,7 +180,7 @@ class ModelWithEncodedNames(_Model): xml={"attribute": False, "name": "SimpleModelData", "text": False, "unwrapped": False}, ) """Required.""" - colors: List[str] = rest_field( + colors: list[str] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "string", "name": "PossibleColors", "text": False, "unwrapped": False}, ) @@ -193,7 +193,7 @@ def __init__( self, *, model_data: "_models.SimpleModel", - colors: List[str], + colors: list[str], ) -> None: ... @overload @@ -257,12 +257,12 @@ class ModelWithRenamedArrays(_Model): :vartype counts: list[int] """ - colors: List[str] = rest_field( + colors: list[str] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "Colors", "name": "Colors", "text": False, "unwrapped": True}, ) """Required.""" - counts: List[int] = rest_field( + counts: list[int] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "int32", "name": "Counts", "text": False, "unwrapped": False}, ) @@ -274,8 +274,8 @@ class ModelWithRenamedArrays(_Model): def __init__( self, *, - colors: List[str], - counts: List[int], + colors: list[str], + counts: list[int], ) -> None: ... @overload @@ -341,12 +341,12 @@ class ModelWithSimpleArrays(_Model): :vartype counts: list[int] """ - colors: List[str] = rest_field( + colors: list[str] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "string", "name": "colors", "text": False, "unwrapped": False}, ) """Required.""" - counts: List[int] = rest_field( + counts: list[int] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "int32", "name": "counts", "text": False, "unwrapped": False}, ) @@ -358,8 +358,8 @@ class ModelWithSimpleArrays(_Model): def __init__( self, *, - colors: List[str], - counts: List[int], + colors: list[str], + counts: list[int], ) -> None: ... @overload @@ -423,12 +423,12 @@ class ModelWithUnwrappedArray(_Model): :vartype counts: list[int] """ - colors: List[str] = rest_field( + colors: list[str] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "colors", "name": "colors", "text": False, "unwrapped": True}, ) """Required.""" - counts: List[int] = rest_field( + counts: list[int] = rest_field( visibility=["read", "create", "update", "delete", "query"], xml={"attribute": False, "itemsName": "int32", "name": "counts", "text": False, "unwrapped": False}, ) @@ -440,8 +440,8 @@ class ModelWithUnwrappedArray(_Model): def __init__( self, *, - colors: List[str], - counts: List[int], + colors: list[str], + counts: list[int], ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/operations/_operations.py b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/operations/_operations.py index 941f2af2195..900280edb24 100644 --- a/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/payload-xml/payload/xml/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -31,7 +31,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -392,7 +392,7 @@ def get(self, **kwargs: Any) -> _models.SimpleModel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -453,7 +453,7 @@ def put(self, input: _models.SimpleModel, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -520,7 +520,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithSimpleArrays: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -583,7 +583,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -650,7 +650,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithArrayOfModel: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -713,7 +713,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -780,7 +780,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithOptionalField: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -843,7 +843,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -910,7 +910,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithAttributes: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -973,7 +973,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1040,7 +1040,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithUnwrappedArray: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1103,7 +1103,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1170,7 +1170,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithRenamedArrays: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1233,7 +1233,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1300,7 +1300,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithRenamedFields: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1363,7 +1363,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1430,7 +1430,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithEmptyArray: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1493,7 +1493,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1560,7 +1560,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithText: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1623,7 +1623,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1690,7 +1690,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithDictionary: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1753,7 +1753,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1820,7 +1820,7 @@ def get(self, **kwargs: Any) -> _models.ModelWithEncodedNames: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1883,7 +1883,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py index 17791e05ef4..4f54aac76e3 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -87,7 +87,7 @@ def error_response_status_code_in_range( # pylint: disable=inconsistent-return- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -133,7 +133,7 @@ def error_response_status_code404(self, **kwargs: Any) -> None: # pylint: disab error_map: MutableMapping = { 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/model_base.py b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/serialization.py b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py index efc0af913ee..82b77041805 100644 --- a/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/response-status-code-range/response/statuscoderange/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._configuration import StatusCodeRangeClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _StatusCodeRangeClientOperationsMixin( @@ -53,7 +53,7 @@ async def error_response_status_code_in_range(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -99,7 +99,7 @@ async def error_response_status_code404(self, **kwargs: Any) -> None: error_map: MutableMapping = { 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/_utils/model_base.py b/packages/typespec-python/test/azure/generated/routes/routes/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/routes/routes/_utils/serialization.py b/packages/typespec-python/test/azure/generated/routes/routes/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/routes/routes/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/aio/operations/_operations.py index cd96825cd73..38399075312 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/aio/operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from .._configuration import RoutesClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class InInterfaceOperations: @@ -62,7 +62,7 @@ async def fixed(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -111,7 +111,7 @@ async def fixed(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/operations/_operations.py index 2f260500a1d..4903d2b8409 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -77,7 +77,7 @@ def fixed(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -126,7 +126,7 @@ def fixed(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-return-s 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/aio/operations/_operations.py index 3d88a0f3c4b..194c98246be 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -35,7 +35,7 @@ from ...simpleexpansion.aio.operations._operations import PathParametersSimpleExpansionOperations T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersOperations: @@ -87,7 +87,7 @@ async def template_only(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -134,7 +134,7 @@ async def explicit(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -181,7 +181,7 @@ async def annotation_only(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/aio/operations/_operations.py index c7fc2c6913f..d70795fc706 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersLabelExpansionExplodeOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/operations/_operations.py index 280023ba30c..7485c872024 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/explode/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_label_expansion_explode_primitive_request( # pylint: def build_path_parameters_label_expansion_explode_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/label/explode/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_label_expansion_explode_array_request( # pylint: disa def build_path_parameters_label_expansion_explode_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/label/explode/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/aio/operations/_operations.py index 74b7c1e76ff..23507182894 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersLabelExpansionStandardOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/operations/_operations.py index 695f301ac7e..02c19fb483f 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/labelexpansion/standard/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_label_expansion_standard_primitive_request( # pylint: def build_path_parameters_label_expansion_standard_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/label/standard/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_label_expansion_standard_array_request( # pylint: dis def build_path_parameters_label_expansion_standard_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/label/standard/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/aio/operations/_operations.py index 0173ae6cf87..fe4fcc81463 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersMatrixExpansionExplodeOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/operations/_operations.py index 68810176f21..598b027330e 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/explode/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_matrix_expansion_explode_primitive_request( # pylint: def build_path_parameters_matrix_expansion_explode_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/matrix/explode/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_matrix_expansion_explode_array_request( # pylint: dis def build_path_parameters_matrix_expansion_explode_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/matrix/explode/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/aio/operations/_operations.py index 5a700848e8e..a3752062835 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersMatrixExpansionStandardOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/operations/_operations.py index e15b3d8069e..40203135c1a 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/matrixexpansion/standard/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_matrix_expansion_standard_primitive_request( # pylint def build_path_parameters_matrix_expansion_standard_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/matrix/standard/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_matrix_expansion_standard_array_request( # pylint: di def build_path_parameters_matrix_expansion_standard_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/matrix/standard/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/operations/_operations.py index 58d90e47d87..6b2fd453074 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ from ..simpleexpansion.operations._operations import PathParametersSimpleExpansionOperations T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -125,7 +125,7 @@ def template_only(self, param: str, **kwargs: Any) -> None: # pylint: disable=i 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -172,7 +172,7 @@ def explicit(self, param: str, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -219,7 +219,7 @@ def annotation_only(self, param: str, **kwargs: Any) -> None: # pylint: disable 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/aio/operations/_operations.py index 212b20fb9e6..85b29c487b1 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersPathExpansionExplodeOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/operations/_operations.py index b5b55dbeda9..145263e4da7 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/explode/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_path_expansion_explode_primitive_request( # pylint: d def build_path_parameters_path_expansion_explode_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/path/explode/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_path_expansion_explode_array_request( # pylint: disab def build_path_parameters_path_expansion_explode_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/path/explode/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/aio/operations/_operations.py index b034d7ab6c1..237b460338b 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersPathExpansionStandardOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/operations/_operations.py index 18cbc2353c7..71fb8f94209 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/pathexpansion/standard/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_path_expansion_standard_primitive_request( # pylint: def build_path_parameters_path_expansion_standard_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/path/standard/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_path_expansion_standard_array_request( # pylint: disa def build_path_parameters_path_expansion_standard_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/path/standard/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/aio/operations/_operations.py index 5558493713a..e740ca9f8b8 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersReservedExpansionOperations: # pylint: disable=name-too-long @@ -65,7 +65,7 @@ async def template(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -112,7 +112,7 @@ async def annotation(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/operations/_operations.py index 5430477cb2b..9e22a867302 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/reservedexpansion/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ...._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -92,7 +92,7 @@ def template(self, param: str, **kwargs: Any) -> None: # pylint: disable=incons 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def annotation(self, param: str, **kwargs: Any) -> None: # pylint: disable=inco 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/aio/operations/_operations.py index 21f0c50040b..de8293da852 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersSimpleExpansionExplodeOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/operations/_operations.py index 0ca6030e09c..f1751432a2c 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/explode/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_simple_expansion_explode_primitive_request( # pylint: def build_path_parameters_simple_expansion_explode_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/simple/explode/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_simple_expansion_explode_array_request( # pylint: dis def build_path_parameters_simple_expansion_explode_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/simple/explode/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/aio/operations/_operations.py index 04ee961c41e..e676b4406a1 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class PathParametersSimpleExpansionStandardOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, param: List[str], **kwargs: Any) -> None: + async def array(self, param: list[str], **kwargs: Any) -> None: """array. :param param: Required. @@ -113,7 +113,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, param: dict[str, int], **kwargs: Any) -> None: """record. :param param: Required. @@ -160,7 +160,7 @@ async def record(self, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/operations/_operations.py index c2480b1399c..acae53e67f8 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/pathparameters/simpleexpansion/standard/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -25,7 +25,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -46,7 +46,7 @@ def build_path_parameters_simple_expansion_standard_primitive_request( # pylint def build_path_parameters_simple_expansion_standard_array_request( # pylint: disable=name-too-long - param: List[str], **kwargs: Any + param: list[str], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/simple/standard/array{param}" @@ -60,7 +60,7 @@ def build_path_parameters_simple_expansion_standard_array_request( # pylint: di def build_path_parameters_simple_expansion_standard_record_request( # pylint: disable=name-too-long - param: Dict[str, int], **kwargs: Any + param: dict[str, int], **kwargs: Any ) -> HttpRequest: # Construct URL _url = "/routes/path/simple/standard/record{param}" @@ -106,7 +106,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -138,7 +138,7 @@ def primitive(self, param: str, **kwargs: Any) -> None: # pylint: disable=incon return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :param param: Required. @@ -153,7 +153,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -185,7 +185,7 @@ def array(self, param: List[str], **kwargs: Any) -> None: # pylint: disable=inc return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :param param: Required. @@ -200,7 +200,7 @@ def record(self, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/aio/operations/_operations.py index 5a25ed42ac7..133dd56548d 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from ...queryexpansion.aio.operations._operations import QueryParametersQueryExpansionOperations T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryParametersOperations: @@ -75,7 +75,7 @@ async def template_only(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -122,7 +122,7 @@ async def explicit(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -169,7 +169,7 @@ async def annotation_only(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/operations/_operations.py index 3887b54f95e..8b00c49e384 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from ..queryexpansion.operations._operations import QueryParametersQueryExpansionOperations T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -114,7 +114,7 @@ def template_only(self, *, param: str, **kwargs: Any) -> None: # pylint: disabl 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -161,7 +161,7 @@ def explicit(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=inc 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -208,7 +208,7 @@ def annotation_only(self, *, param: str, **kwargs: Any) -> None: # pylint: disa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/aio/operations/_operations.py index b520f39db99..92cb518665d 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryParametersQueryContinuationExplodeOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, *, param: List[str], **kwargs: Any) -> None: + async def array(self, *, param: list[str], **kwargs: Any) -> None: """array. :keyword param: Required. @@ -113,7 +113,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, *, param: dict[str, int], **kwargs: Any) -> None: """record. :keyword param: Required. @@ -160,7 +160,7 @@ async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/operations/_operations.py index f4e56e011f7..9f86cd92e03 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/explode/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -47,7 +47,7 @@ def build_query_parameters_query_continuation_explode_primitive_request( # pyli def build_query_parameters_query_continuation_explode_array_request( # pylint: disable=name-too-long - *, param: List[str], **kwargs: Any + *, param: list[str], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -61,7 +61,7 @@ def build_query_parameters_query_continuation_explode_array_request( # pylint: def build_query_parameters_query_continuation_explode_record_request( # pylint: disable=name-too-long - *, param: Dict[str, int], **kwargs: Any + *, param: dict[str, int], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -107,7 +107,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, *, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :keyword param: Required. @@ -154,7 +154,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -186,7 +186,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, *, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :keyword param: Required. @@ -201,7 +201,7 @@ def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/aio/operations/_operations.py index bab0bd63f71..1ac9fa29725 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryParametersQueryContinuationStandardOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, *, param: List[str], **kwargs: Any) -> None: + async def array(self, *, param: list[str], **kwargs: Any) -> None: """array. :keyword param: Required. @@ -113,7 +113,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, *, param: dict[str, int], **kwargs: Any) -> None: """record. :keyword param: Required. @@ -160,7 +160,7 @@ async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/operations/_operations.py index d9a1cd12ffd..fb772397854 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/querycontinuation/standard/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -47,7 +47,7 @@ def build_query_parameters_query_continuation_standard_primitive_request( # pyl def build_query_parameters_query_continuation_standard_array_request( # pylint: disable=name-too-long - *, param: List[str], **kwargs: Any + *, param: list[str], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -61,7 +61,7 @@ def build_query_parameters_query_continuation_standard_array_request( # pylint: def build_query_parameters_query_continuation_standard_record_request( # pylint: disable=name-too-long - *, param: Dict[str, int], **kwargs: Any + *, param: dict[str, int], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -107,7 +107,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, *, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :keyword param: Required. @@ -154,7 +154,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -186,7 +186,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, *, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :keyword param: Required. @@ -201,7 +201,7 @@ def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/aio/operations/_operations.py index b141c4d611f..100cc90b0a5 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryParametersQueryExpansionExplodeOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, *, param: List[str], **kwargs: Any) -> None: + async def array(self, *, param: list[str], **kwargs: Any) -> None: """array. :keyword param: Required. @@ -113,7 +113,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, *, param: dict[str, int], **kwargs: Any) -> None: """record. :keyword param: Required. @@ -160,7 +160,7 @@ async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/operations/_operations.py index 577cb65b945..9eff79fe825 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/explode/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -47,7 +47,7 @@ def build_query_parameters_query_expansion_explode_primitive_request( # pylint: def build_query_parameters_query_expansion_explode_array_request( # pylint: disable=name-too-long - *, param: List[str], **kwargs: Any + *, param: list[str], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -61,7 +61,7 @@ def build_query_parameters_query_expansion_explode_array_request( # pylint: dis def build_query_parameters_query_expansion_explode_record_request( # pylint: disable=name-too-long - *, param: Dict[str, int], **kwargs: Any + *, param: dict[str, int], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -107,7 +107,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, *, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :keyword param: Required. @@ -154,7 +154,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -186,7 +186,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, *, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :keyword param: Required. @@ -201,7 +201,7 @@ def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/aio/operations/_operations.py index 644bae07996..259d81cc0c1 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -30,7 +30,7 @@ ) T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class QueryParametersQueryExpansionStandardOperations: # pylint: disable=name-too-long @@ -66,7 +66,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -98,7 +98,7 @@ async def primitive(self, *, param: str, **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def array(self, *, param: List[str], **kwargs: Any) -> None: + async def array(self, *, param: list[str], **kwargs: Any) -> None: """array. :keyword param: Required. @@ -113,7 +113,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def array(self, *, param: List[str], **kwargs: Any) -> None: return cls(pipeline_response, None, {}) # type: ignore @distributed_trace_async - async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: + async def record(self, *, param: dict[str, int], **kwargs: Any) -> None: """record. :keyword param: Required. @@ -160,7 +160,7 @@ async def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/operations/_operations.py b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/operations/_operations.py index 8bafb9f4f1a..37a060e2803 100644 --- a/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/routes/routes/queryparameters/queryexpansion/standard/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from ....._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -47,7 +47,7 @@ def build_query_parameters_query_expansion_standard_primitive_request( # pylint def build_query_parameters_query_expansion_standard_array_request( # pylint: disable=name-too-long - *, param: List[str], **kwargs: Any + *, param: list[str], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -61,7 +61,7 @@ def build_query_parameters_query_expansion_standard_array_request( # pylint: di def build_query_parameters_query_expansion_standard_record_request( # pylint: disable=name-too-long - *, param: Dict[str, int], **kwargs: Any + *, param: dict[str, int], **kwargs: Any ) -> HttpRequest: _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) @@ -107,7 +107,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -139,7 +139,7 @@ def primitive(self, *, param: str, **kwargs: Any) -> None: # pylint: disable=in return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def array(self, *, param: list[str], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """array. :keyword param: Required. @@ -154,7 +154,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -186,7 +186,7 @@ def array(self, *, param: List[str], **kwargs: Any) -> None: # pylint: disable= return cls(pipeline_response, None, {}) # type: ignore @distributed_trace - def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements + def record(self, *, param: dict[str, int], **kwargs: Any) -> None: # pylint: disable=inconsistent-return-statements """record. :keyword param: Required. @@ -201,7 +201,7 @@ def record(self, *, param: Dict[str, int], **kwargs: Any) -> None: # pylint: di 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_operations/_operations.py b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_operations/_operations.py index 209472215fd..760e6252672 100644 --- a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -26,7 +26,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -62,7 +62,7 @@ def valid_key(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -106,7 +106,7 @@ def valid_token(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/model_base.py b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/serialization.py b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/aio/_operations/_operations.py index 17ffa16469e..02988401343 100644 --- a/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/setuppy-authentication-union/setuppy/authentication/union/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import UnionClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _UnionClientOperationsMixin( @@ -48,7 +48,7 @@ async def valid_key(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -92,7 +92,7 @@ async def valid_token(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_operations/_operations.py b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_operations/_operations.py index 87d6518860e..5d7ea5a05c4 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import MatchConditions, PipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC, prep_if_match, prep_if_none_match T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -134,7 +134,7 @@ def post_if_match( # pylint: disable=inconsistent-return-statements error_map[412] = ResourceNotFoundError elif match_condition == MatchConditions.IfMissing: error_map[412] = ResourceExistsError - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -193,7 +193,7 @@ def post_if_none_match( # pylint: disable=inconsistent-return-statements error_map[412] = ResourceNotFoundError elif match_condition == MatchConditions.IfMissing: error_map[412] = ResourceExistsError - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -244,7 +244,7 @@ def head_if_modified_since(self, *, if_modified_since: Optional[datetime.datetim 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -297,7 +297,7 @@ def post_if_unmodified_since( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/model_base.py b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/serialization.py b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/aio/_operations/_operations.py index 9707c835583..3d2ebb6f0e7 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-headers-conditional-request/specialheaders/conditionalrequest/aio/_operations/_operations.py @@ -8,7 +8,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient, MatchConditions from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._configuration import ConditionalRequestClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _ConditionalRequestClientOperationsMixin( @@ -68,7 +68,7 @@ async def post_if_match( error_map[412] = ResourceNotFoundError elif match_condition == MatchConditions.IfMissing: error_map[412] = ResourceExistsError - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -127,7 +127,7 @@ async def post_if_none_match( error_map[412] = ResourceNotFoundError elif match_condition == MatchConditions.IfMissing: error_map[412] = ResourceExistsError - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -180,7 +180,7 @@ async def head_if_modified_since( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -233,7 +233,7 @@ async def post_if_unmodified_since( 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_operations/_operations.py b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_operations/_operations.py index 0a108dfa4b8..2038375026a 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_operations/_operations.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- from collections.abc import MutableMapping import datetime -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar import uuid from azure.core import PipelineClient @@ -29,7 +29,7 @@ from .._utils.utils import ClientMixinABC T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -70,7 +70,7 @@ def immediate_success(self, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/model_base.py b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/serialization.py b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/aio/_operations/_operations.py b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/aio/_operations/_operations.py index bc18f823594..623096f94fb 100644 --- a/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/aio/_operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-headers-repeatability/specialheaders/repeatability/aio/_operations/_operations.py @@ -7,7 +7,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -27,7 +27,7 @@ from .._configuration import RepeatabilityClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class _RepeatabilityClientOperationsMixin( @@ -48,7 +48,7 @@ async def immediate_success(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/model_base.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/serialization.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py index a84ad15f3a2..ffbceab7666 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/aio/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -135,7 +135,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class ModelsOperations: # pylint: disable=too-many-public-methods @@ -213,7 +213,7 @@ async def with_and(self, body: Union[_models.AndModel, JSON, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -311,7 +311,7 @@ async def with_as(self, body: Union[_models.AsModel, JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -411,7 +411,7 @@ async def with_assert(self, body: Union[_models.AssertModel, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -511,7 +511,7 @@ async def with_async(self, body: Union[_models.AsyncModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -611,7 +611,7 @@ async def with_await(self, body: Union[_models.AwaitModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -711,7 +711,7 @@ async def with_break(self, body: Union[_models.BreakModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -811,7 +811,7 @@ async def with_class(self, body: Union[_models.ClassModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -911,7 +911,7 @@ async def with_constructor(self, body: Union[_models.Constructor, JSON, IO[bytes 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1011,7 +1011,7 @@ async def with_continue(self, body: Union[_models.ContinueModel, JSON, IO[bytes] 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1109,7 +1109,7 @@ async def with_def(self, body: Union[_models.DefModel, JSON, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1207,7 +1207,7 @@ async def with_del(self, body: Union[_models.DelModel, JSON, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1307,7 +1307,7 @@ async def with_elif(self, body: Union[_models.ElifModel, JSON, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1407,7 +1407,7 @@ async def with_else(self, body: Union[_models.ElseModel, JSON, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1507,7 +1507,7 @@ async def with_except(self, body: Union[_models.ExceptModel, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1607,7 +1607,7 @@ async def with_exec(self, body: Union[_models.ExecModel, JSON, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1707,7 +1707,7 @@ async def with_finally(self, body: Union[_models.FinallyModel, JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1805,7 +1805,7 @@ async def with_for(self, body: Union[_models.ForModel, JSON, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1905,7 +1905,7 @@ async def with_from(self, body: Union[_models.FromModel, JSON, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2005,7 +2005,7 @@ async def with_global(self, body: Union[_models.GlobalModel, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2103,7 +2103,7 @@ async def with_if(self, body: Union[_models.IfModel, JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2203,7 +2203,7 @@ async def with_import(self, body: Union[_models.ImportModel, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2301,7 +2301,7 @@ async def with_in(self, body: Union[_models.InModel, JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2399,7 +2399,7 @@ async def with_is(self, body: Union[_models.IsModel, JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2499,7 +2499,7 @@ async def with_lambda(self, body: Union[_models.LambdaModel, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2597,7 +2597,7 @@ async def with_not(self, body: Union[_models.NotModel, JSON, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2695,7 +2695,7 @@ async def with_or(self, body: Union[_models.OrModel, JSON, IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2795,7 +2795,7 @@ async def with_pass(self, body: Union[_models.PassModel, JSON, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2895,7 +2895,7 @@ async def with_raise(self, body: Union[_models.RaiseModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2995,7 +2995,7 @@ async def with_return(self, body: Union[_models.ReturnModel, JSON, IO[bytes]], * 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3093,7 +3093,7 @@ async def with_try(self, body: Union[_models.TryModel, JSON, IO[bytes]], **kwarg 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3193,7 +3193,7 @@ async def with_while(self, body: Union[_models.WhileModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3293,7 +3293,7 @@ async def with_with(self, body: Union[_models.WithModel, JSON, IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3393,7 +3393,7 @@ async def with_yield(self, body: Union[_models.YieldModel, JSON, IO[bytes]], **k 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3511,7 +3511,7 @@ async def same_as_model(self, body: Union[_models.SameAsModel, JSON, IO[bytes]], 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3583,7 +3583,7 @@ async def and_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3627,7 +3627,7 @@ async def as_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3671,7 +3671,7 @@ async def assert_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3715,7 +3715,7 @@ async def async_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3759,7 +3759,7 @@ async def await_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3803,7 +3803,7 @@ async def break_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3847,7 +3847,7 @@ async def class_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3891,7 +3891,7 @@ async def constructor(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3935,7 +3935,7 @@ async def continue_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -3979,7 +3979,7 @@ async def def_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4023,7 +4023,7 @@ async def del_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4067,7 +4067,7 @@ async def elif_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4111,7 +4111,7 @@ async def else_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4155,7 +4155,7 @@ async def except_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4199,7 +4199,7 @@ async def exec_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4243,7 +4243,7 @@ async def finally_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4287,7 +4287,7 @@ async def for_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4331,7 +4331,7 @@ async def from_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4375,7 +4375,7 @@ async def global_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4419,7 +4419,7 @@ async def if_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4463,7 +4463,7 @@ async def import_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4507,7 +4507,7 @@ async def in_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4551,7 +4551,7 @@ async def is_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4595,7 +4595,7 @@ async def lambda_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4639,7 +4639,7 @@ async def not_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4683,7 +4683,7 @@ async def or_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4727,7 +4727,7 @@ async def pass_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4771,7 +4771,7 @@ async def raise_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4815,7 +4815,7 @@ async def return_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4859,7 +4859,7 @@ async def try_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4903,7 +4903,7 @@ async def while_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4947,7 +4947,7 @@ async def with_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4991,7 +4991,7 @@ async def yield_method(self, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5055,7 +5055,7 @@ async def with_and(self, *, and_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5102,7 +5102,7 @@ async def with_as(self, *, as_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5149,7 +5149,7 @@ async def with_assert(self, *, assert_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5196,7 +5196,7 @@ async def with_async(self, *, async_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5243,7 +5243,7 @@ async def with_await(self, *, await_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5290,7 +5290,7 @@ async def with_break(self, *, break_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5337,7 +5337,7 @@ async def with_class(self, *, class_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5384,7 +5384,7 @@ async def with_constructor(self, *, constructor: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5431,7 +5431,7 @@ async def with_continue(self, *, continue_parameter: str, **kwargs: Any) -> None 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5478,7 +5478,7 @@ async def with_def(self, *, def_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5525,7 +5525,7 @@ async def with_del(self, *, del_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5572,7 +5572,7 @@ async def with_elif(self, *, elif_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5619,7 +5619,7 @@ async def with_else(self, *, else_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5666,7 +5666,7 @@ async def with_except(self, *, except_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5713,7 +5713,7 @@ async def with_exec(self, *, exec_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5760,7 +5760,7 @@ async def with_finally(self, *, finally_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5807,7 +5807,7 @@ async def with_for(self, *, for_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5854,7 +5854,7 @@ async def with_from(self, *, from_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5901,7 +5901,7 @@ async def with_global(self, *, global_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5948,7 +5948,7 @@ async def with_if(self, *, if_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5995,7 +5995,7 @@ async def with_import(self, *, import_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6042,7 +6042,7 @@ async def with_in(self, *, in_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6089,7 +6089,7 @@ async def with_is(self, *, is_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6136,7 +6136,7 @@ async def with_lambda(self, *, lambda_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6183,7 +6183,7 @@ async def with_not(self, *, not_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6230,7 +6230,7 @@ async def with_or(self, *, or_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6277,7 +6277,7 @@ async def with_pass(self, *, pass_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6324,7 +6324,7 @@ async def with_raise(self, *, raise_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6371,7 +6371,7 @@ async def with_return(self, *, return_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6418,7 +6418,7 @@ async def with_try(self, *, try_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6465,7 +6465,7 @@ async def with_while(self, *, while_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6512,7 +6512,7 @@ async def with_with(self, *, with_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6559,7 +6559,7 @@ async def with_yield(self, *, yield_parameter: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6606,7 +6606,7 @@ async def with_cancellation_token(self, *, cancellation_token: str, **kwargs: An 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py b/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py index 4f02403915e..0643dd84e10 100644 --- a/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/special-words/specialwords/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ JSON = MutableMapping[str, Any] T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -1234,7 +1234,7 @@ def with_and( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1334,7 +1334,7 @@ def with_as( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1434,7 +1434,7 @@ def with_assert( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1534,7 +1534,7 @@ def with_async( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1634,7 +1634,7 @@ def with_await( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1734,7 +1734,7 @@ def with_break( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1834,7 +1834,7 @@ def with_class( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1936,7 +1936,7 @@ def with_constructor( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2038,7 +2038,7 @@ def with_continue( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2138,7 +2138,7 @@ def with_def( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2238,7 +2238,7 @@ def with_del( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2338,7 +2338,7 @@ def with_elif( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2438,7 +2438,7 @@ def with_else( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2538,7 +2538,7 @@ def with_except( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2638,7 +2638,7 @@ def with_exec( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2740,7 +2740,7 @@ def with_finally( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2840,7 +2840,7 @@ def with_for( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2940,7 +2940,7 @@ def with_from( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3040,7 +3040,7 @@ def with_global( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3140,7 +3140,7 @@ def with_if( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3240,7 +3240,7 @@ def with_import( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3340,7 +3340,7 @@ def with_in( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3440,7 +3440,7 @@ def with_is( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3540,7 +3540,7 @@ def with_lambda( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3640,7 +3640,7 @@ def with_not( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3740,7 +3740,7 @@ def with_or( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3840,7 +3840,7 @@ def with_pass( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -3940,7 +3940,7 @@ def with_raise( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4040,7 +4040,7 @@ def with_return( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4140,7 +4140,7 @@ def with_try( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4240,7 +4240,7 @@ def with_while( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4340,7 +4340,7 @@ def with_with( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4440,7 +4440,7 @@ def with_yield( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4560,7 +4560,7 @@ def same_as_model( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -4632,7 +4632,7 @@ def and_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4676,7 +4676,7 @@ def as_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4720,7 +4720,7 @@ def assert_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4764,7 +4764,7 @@ def async_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4808,7 +4808,7 @@ def await_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4852,7 +4852,7 @@ def break_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4896,7 +4896,7 @@ def class_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4940,7 +4940,7 @@ def constructor(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -4984,7 +4984,7 @@ def continue_method(self, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5028,7 +5028,7 @@ def def_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5072,7 +5072,7 @@ def del_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5116,7 +5116,7 @@ def elif_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5160,7 +5160,7 @@ def else_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5204,7 +5204,7 @@ def except_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5248,7 +5248,7 @@ def exec_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5292,7 +5292,7 @@ def finally_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5336,7 +5336,7 @@ def for_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5380,7 +5380,7 @@ def from_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5424,7 +5424,7 @@ def global_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5468,7 +5468,7 @@ def if_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5512,7 +5512,7 @@ def import_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5556,7 +5556,7 @@ def in_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5600,7 +5600,7 @@ def is_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5644,7 +5644,7 @@ def lambda_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5688,7 +5688,7 @@ def not_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5732,7 +5732,7 @@ def or_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-retu 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5776,7 +5776,7 @@ def pass_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5820,7 +5820,7 @@ def raise_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5864,7 +5864,7 @@ def return_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent- 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5908,7 +5908,7 @@ def try_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-ret 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5952,7 +5952,7 @@ def while_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -5996,7 +5996,7 @@ def with_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-re 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6040,7 +6040,7 @@ def yield_method(self, **kwargs: Any) -> None: # pylint: disable=inconsistent-r 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6104,7 +6104,7 @@ def with_and(self, *, and_parameter: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6151,7 +6151,7 @@ def with_as(self, *, as_parameter: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6200,7 +6200,7 @@ def with_assert( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6249,7 +6249,7 @@ def with_async( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6298,7 +6298,7 @@ def with_await( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6347,7 +6347,7 @@ def with_break( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6396,7 +6396,7 @@ def with_class( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6445,7 +6445,7 @@ def with_constructor( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6494,7 +6494,7 @@ def with_continue( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6541,7 +6541,7 @@ def with_def(self, *, def_parameter: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6588,7 +6588,7 @@ def with_del(self, *, del_parameter: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6637,7 +6637,7 @@ def with_elif( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6686,7 +6686,7 @@ def with_else( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6735,7 +6735,7 @@ def with_except( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6784,7 +6784,7 @@ def with_exec( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6833,7 +6833,7 @@ def with_finally( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6880,7 +6880,7 @@ def with_for(self, *, for_parameter: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6929,7 +6929,7 @@ def with_from( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -6978,7 +6978,7 @@ def with_global( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7025,7 +7025,7 @@ def with_if(self, *, if_parameter: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7074,7 +7074,7 @@ def with_import( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7121,7 +7121,7 @@ def with_in(self, *, in_parameter: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7168,7 +7168,7 @@ def with_is(self, *, is_parameter: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7217,7 +7217,7 @@ def with_lambda( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7264,7 +7264,7 @@ def with_not(self, *, not_parameter: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7311,7 +7311,7 @@ def with_or(self, *, or_parameter: str, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7360,7 +7360,7 @@ def with_pass( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7409,7 +7409,7 @@ def with_raise( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7458,7 +7458,7 @@ def with_return( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7505,7 +7505,7 @@ def with_try(self, *, try_parameter: str, **kwargs: Any) -> None: # pylint: dis 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7554,7 +7554,7 @@ def with_while( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7603,7 +7603,7 @@ def with_with( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7652,7 +7652,7 @@ def with_yield( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -7701,7 +7701,7 @@ def with_cancellation_token( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/model_base.py b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/serialization.py b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/aio/operations/_operations.py index 4a1dec7e64c..62c5f1cee42 100644 --- a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/aio/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar +from typing import Any, AsyncIterator, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -29,7 +29,7 @@ from ...operations._operations import build_basic_receive_request, build_basic_send_request T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class BasicOperations: @@ -65,7 +65,7 @@ async def send(self, body: bytes, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -114,7 +114,7 @@ async def receive(self, **kwargs: Any) -> AsyncIterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/operations/_operations.py b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/operations/_operations.py index 72c9354077a..d4922cf955e 100644 --- a/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/streaming-jsonl/streaming/jsonl/basic/operations/_operations.py @@ -6,7 +6,7 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- from collections.abc import MutableMapping -from typing import Any, Callable, Dict, Iterator, Optional, TypeVar +from typing import Any, Callable, Iterator, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -28,7 +28,7 @@ from ..._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -94,7 +94,7 @@ def send(self, body: bytes, **kwargs: Any) -> None: # pylint: disable=inconsist 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -143,7 +143,7 @@ def receive(self, **kwargs: Any) -> Iterator[bytes]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/model_base.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/serialization.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py index 183bd606b62..8a8710a48b9 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/aio/operations/_operations.py @@ -10,7 +10,7 @@ import datetime from io import IOBase import json -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -64,7 +64,7 @@ from .._configuration import ArrayClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class Int32ValueOperations: @@ -85,7 +85,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[int]: + async def get(self, **kwargs: Any) -> list[int]: """get. :return: list of int @@ -98,12 +98,12 @@ async def get(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_int32_value_get_request( headers=_headers, @@ -133,7 +133,7 @@ async def get(self, **kwargs: Any) -> List[int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[int], response.json()) + deserialized = _deserialize(list[int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -141,7 +141,7 @@ async def get(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put(self, body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -169,7 +169,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [int] type or a IO[bytes] type. Required. @@ -184,7 +184,7 @@ async def put(self, body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -243,7 +243,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[int]: + async def get(self, **kwargs: Any) -> list[int]: """get. :return: list of int @@ -256,12 +256,12 @@ async def get(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_int64_value_get_request( headers=_headers, @@ -291,7 +291,7 @@ async def get(self, **kwargs: Any) -> List[int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[int], response.json()) + deserialized = _deserialize(list[int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -299,7 +299,7 @@ async def get(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put(self, body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -327,7 +327,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [int] type or a IO[bytes] type. Required. @@ -342,7 +342,7 @@ async def put(self, body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -401,7 +401,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[bool]: + async def get(self, **kwargs: Any) -> list[bool]: """get. :return: list of bool @@ -414,12 +414,12 @@ async def get(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_boolean_value_get_request( headers=_headers, @@ -449,7 +449,7 @@ async def get(self, **kwargs: Any) -> List[bool]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[bool], response.json()) + deserialized = _deserialize(list[bool], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -457,7 +457,7 @@ async def get(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @overload - async def put(self, body: List[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -485,7 +485,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [bool] type or a IO[bytes] type. Required. @@ -500,7 +500,7 @@ async def put(self, body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -559,7 +559,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[str]: + async def get(self, **kwargs: Any) -> list[str]: """get. :return: list of str @@ -572,12 +572,12 @@ async def get(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_string_value_get_request( headers=_headers, @@ -607,7 +607,7 @@ async def get(self, **kwargs: Any) -> List[str]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[str], response.json()) + deserialized = _deserialize(list[str], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -615,7 +615,7 @@ async def get(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - async def put(self, body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -643,7 +643,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [str] type or a IO[bytes] type. Required. @@ -658,7 +658,7 @@ async def put(self, body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -717,7 +717,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[float]: + async def get(self, **kwargs: Any) -> list[float]: """get. :return: list of float @@ -730,12 +730,12 @@ async def get(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_float32_value_get_request( headers=_headers, @@ -765,7 +765,7 @@ async def get(self, **kwargs: Any) -> List[float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[float], response.json()) + deserialized = _deserialize(list[float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -773,7 +773,7 @@ async def get(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @overload - async def put(self, body: List[float], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -801,7 +801,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [float] type or a IO[bytes] type. Required. @@ -816,7 +816,7 @@ async def put(self, body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -875,7 +875,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[datetime.datetime]: + async def get(self, **kwargs: Any) -> list[datetime.datetime]: """get. :return: list of datetime @@ -888,12 +888,12 @@ async def get(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_datetime_value_get_request( headers=_headers, @@ -923,7 +923,7 @@ async def get(self, **kwargs: Any) -> List[datetime.datetime]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[datetime.datetime], response.json()) + deserialized = _deserialize(list[datetime.datetime], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -932,7 +932,7 @@ async def get(self, **kwargs: Any) -> List[datetime.datetime]: @overload async def put( - self, body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -961,7 +961,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [datetime.datetime] type or a IO[bytes] type. Required. @@ -976,7 +976,7 @@ async def put(self, body: Union[List[datetime.datetime], IO[bytes]], **kwargs: A 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1035,7 +1035,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[datetime.timedelta]: + async def get(self, **kwargs: Any) -> list[datetime.timedelta]: """get. :return: list of timedelta @@ -1048,12 +1048,12 @@ async def get(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_duration_value_get_request( headers=_headers, @@ -1083,7 +1083,7 @@ async def get(self, **kwargs: Any) -> List[datetime.timedelta]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[datetime.timedelta], response.json()) + deserialized = _deserialize(list[datetime.timedelta], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1092,7 +1092,7 @@ async def get(self, **kwargs: Any) -> List[datetime.timedelta]: @overload async def put( - self, body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1121,7 +1121,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [datetime.timedelta] type or a IO[bytes] type. Required. @@ -1136,7 +1136,7 @@ async def put(self, body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1195,7 +1195,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[Any]: + async def get(self, **kwargs: Any) -> list[Any]: """get. :return: list of any @@ -1208,12 +1208,12 @@ async def get(self, **kwargs: Any) -> List[Any]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Any]] = kwargs.pop("cls", None) + cls: ClsType[list[Any]] = kwargs.pop("cls", None) _request = build_unknown_value_get_request( headers=_headers, @@ -1243,7 +1243,7 @@ async def get(self, **kwargs: Any) -> List[Any]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[Any], response.json()) + deserialized = _deserialize(list[Any], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1251,7 +1251,7 @@ async def get(self, **kwargs: Any) -> List[Any]: return deserialized # type: ignore @overload - async def put(self, body: List[Any], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[Any], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1279,7 +1279,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[Any], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[Any], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [Any] type or a IO[bytes] type. Required. @@ -1294,7 +1294,7 @@ async def put(self, body: Union[List[Any], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1353,7 +1353,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[_models.InnerModel]: + async def get(self, **kwargs: Any) -> list[_models.InnerModel]: """get. :return: list of InnerModel @@ -1366,12 +1366,12 @@ async def get(self, **kwargs: Any) -> List[_models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.InnerModel]] = kwargs.pop("cls", None) _request = build_model_value_get_request( headers=_headers, @@ -1401,7 +1401,7 @@ async def get(self, **kwargs: Any) -> List[_models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[_models.InnerModel], response.json()) + deserialized = _deserialize(list[_models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1410,7 +1410,7 @@ async def get(self, **kwargs: Any) -> List[_models.InnerModel]: @overload async def put( - self, body: List[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any + self, body: list[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1439,7 +1439,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[_models.InnerModel], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[_models.InnerModel], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [InnerModel] type or a IO[bytes] type. Required. @@ -1454,7 +1454,7 @@ async def put(self, body: Union[List[_models.InnerModel], IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1513,7 +1513,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[float]: + async def get(self, **kwargs: Any) -> list[float]: """get. :return: list of float @@ -1526,12 +1526,12 @@ async def get(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_nullable_float_value_get_request( headers=_headers, @@ -1561,7 +1561,7 @@ async def get(self, **kwargs: Any) -> List[float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[float], response.json()) + deserialized = _deserialize(list[float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1569,7 +1569,7 @@ async def get(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @overload - async def put(self, body: List[float], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1597,7 +1597,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[float], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [float] type or a IO[bytes] type. Required. @@ -1612,7 +1612,7 @@ async def put(self, body: Union[List[float], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1671,7 +1671,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[int]: + async def get(self, **kwargs: Any) -> list[int]: """get. :return: list of int @@ -1684,12 +1684,12 @@ async def get(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_nullable_int32_value_get_request( headers=_headers, @@ -1719,7 +1719,7 @@ async def get(self, **kwargs: Any) -> List[int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[int], response.json()) + deserialized = _deserialize(list[int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1727,7 +1727,7 @@ async def get(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - async def put(self, body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1755,7 +1755,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[int], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [int] type or a IO[bytes] type. Required. @@ -1770,7 +1770,7 @@ async def put(self, body: Union[List[int], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1829,7 +1829,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[bool]: + async def get(self, **kwargs: Any) -> list[bool]: """get. :return: list of bool @@ -1842,12 +1842,12 @@ async def get(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_nullable_boolean_value_get_request( headers=_headers, @@ -1877,7 +1877,7 @@ async def get(self, **kwargs: Any) -> List[bool]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[bool], response.json()) + deserialized = _deserialize(list[bool], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1885,7 +1885,7 @@ async def get(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @overload - async def put(self, body: List[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1913,7 +1913,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[bool], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [bool] type or a IO[bytes] type. Required. @@ -1928,7 +1928,7 @@ async def put(self, body: Union[List[bool], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1987,7 +1987,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[str]: + async def get(self, **kwargs: Any) -> list[str]: """get. :return: list of str @@ -2000,12 +2000,12 @@ async def get(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_nullable_string_value_get_request( headers=_headers, @@ -2035,7 +2035,7 @@ async def get(self, **kwargs: Any) -> List[str]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[str], response.json()) + deserialized = _deserialize(list[str], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2043,7 +2043,7 @@ async def get(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - async def put(self, body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -2071,7 +2071,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[str], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [str] type or a IO[bytes] type. Required. @@ -2086,7 +2086,7 @@ async def put(self, body: Union[List[str], IO[bytes]], **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2145,7 +2145,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> List[_models.InnerModel]: + async def get(self, **kwargs: Any) -> list[_models.InnerModel]: """get. :return: list of InnerModel @@ -2158,12 +2158,12 @@ async def get(self, **kwargs: Any) -> List[_models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.InnerModel]] = kwargs.pop("cls", None) _request = build_nullable_model_value_get_request( headers=_headers, @@ -2193,7 +2193,7 @@ async def get(self, **kwargs: Any) -> List[_models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[_models.InnerModel], response.json()) + deserialized = _deserialize(list[_models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2202,7 +2202,7 @@ async def get(self, **kwargs: Any) -> List[_models.InnerModel]: @overload async def put( - self, body: List[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any + self, body: list[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -2231,7 +2231,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[List[_models.InnerModel], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[list[_models.InnerModel], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a [InnerModel] type or a IO[bytes] type. Required. @@ -2246,7 +2246,7 @@ async def put(self, body: Union[List[_models.InnerModel], IO[bytes]], **kwargs: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py index 11a7a61b6ab..07fbe6b1ec2 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, List, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from .._utils.model_base import Model as _Model, rest_field @@ -26,7 +26,7 @@ class InnerModel(_Model): property: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required string property. Required.""" - children: Optional[List["_models.InnerModel"]] = rest_field( + children: Optional[list["_models.InnerModel"]] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) @@ -35,7 +35,7 @@ def __init__( self, *, property: str, # pylint: disable=redefined-builtin - children: Optional[List["_models.InnerModel"]] = None, + children: Optional[list["_models.InnerModel"]] = None, ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py index 029696a9dfe..2d2894894be 100644 --- a/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-array/typetest/array/operations/_operations.py @@ -10,7 +10,7 @@ import datetime from io import IOBase import json -from typing import Any, Callable, Dict, IO, List, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -450,7 +450,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[int]: + def get(self, **kwargs: Any) -> list[int]: """get. :return: list of int @@ -463,12 +463,12 @@ def get(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_int32_value_get_request( headers=_headers, @@ -498,7 +498,7 @@ def get(self, **kwargs: Any) -> List[int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[int], response.json()) + deserialized = _deserialize(list[int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -506,7 +506,7 @@ def get(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put(self, body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -535,7 +535,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[int], IO[bytes]], **kwargs: Any + self, body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -551,7 +551,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -610,7 +610,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[int]: + def get(self, **kwargs: Any) -> list[int]: """get. :return: list of int @@ -623,12 +623,12 @@ def get(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_int64_value_get_request( headers=_headers, @@ -658,7 +658,7 @@ def get(self, **kwargs: Any) -> List[int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[int], response.json()) + deserialized = _deserialize(list[int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -666,7 +666,7 @@ def get(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put(self, body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -695,7 +695,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[int], IO[bytes]], **kwargs: Any + self, body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -711,7 +711,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -770,7 +770,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[bool]: + def get(self, **kwargs: Any) -> list[bool]: """get. :return: list of bool @@ -783,12 +783,12 @@ def get(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_boolean_value_get_request( headers=_headers, @@ -818,7 +818,7 @@ def get(self, **kwargs: Any) -> List[bool]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[bool], response.json()) + deserialized = _deserialize(list[bool], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -826,7 +826,7 @@ def get(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @overload - def put(self, body: List[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -855,7 +855,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[bool], IO[bytes]], **kwargs: Any + self, body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -871,7 +871,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -930,7 +930,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[str]: + def get(self, **kwargs: Any) -> list[str]: """get. :return: list of str @@ -943,12 +943,12 @@ def get(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_string_value_get_request( headers=_headers, @@ -978,7 +978,7 @@ def get(self, **kwargs: Any) -> List[str]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[str], response.json()) + deserialized = _deserialize(list[str], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -986,7 +986,7 @@ def get(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put(self, body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1015,7 +1015,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[str], IO[bytes]], **kwargs: Any + self, body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1031,7 +1031,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1090,7 +1090,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[float]: + def get(self, **kwargs: Any) -> list[float]: """get. :return: list of float @@ -1103,12 +1103,12 @@ def get(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_float32_value_get_request( headers=_headers, @@ -1138,7 +1138,7 @@ def get(self, **kwargs: Any) -> List[float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[float], response.json()) + deserialized = _deserialize(list[float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1146,7 +1146,7 @@ def get(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @overload - def put(self, body: List[float], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1175,7 +1175,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[float], IO[bytes]], **kwargs: Any + self, body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1191,7 +1191,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1250,7 +1250,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[datetime.datetime]: + def get(self, **kwargs: Any) -> list[datetime.datetime]: """get. :return: list of datetime @@ -1263,12 +1263,12 @@ def get(self, **kwargs: Any) -> List[datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.datetime]] = kwargs.pop("cls", None) _request = build_datetime_value_get_request( headers=_headers, @@ -1298,7 +1298,7 @@ def get(self, **kwargs: Any) -> List[datetime.datetime]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[datetime.datetime], response.json()) + deserialized = _deserialize(list[datetime.datetime], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1306,7 +1306,7 @@ def get(self, **kwargs: Any) -> List[datetime.datetime]: return deserialized # type: ignore @overload - def put(self, body: List[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[datetime.datetime], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1335,7 +1335,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[datetime.datetime], IO[bytes]], **kwargs: Any + self, body: Union[list[datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1351,7 +1351,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1410,7 +1410,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[datetime.timedelta]: + def get(self, **kwargs: Any) -> list[datetime.timedelta]: """get. :return: list of timedelta @@ -1423,12 +1423,12 @@ def get(self, **kwargs: Any) -> List[datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[list[datetime.timedelta]] = kwargs.pop("cls", None) _request = build_duration_value_get_request( headers=_headers, @@ -1458,7 +1458,7 @@ def get(self, **kwargs: Any) -> List[datetime.timedelta]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[datetime.timedelta], response.json()) + deserialized = _deserialize(list[datetime.timedelta], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1466,7 +1466,7 @@ def get(self, **kwargs: Any) -> List[datetime.timedelta]: return deserialized # type: ignore @overload - def put(self, body: List[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1495,7 +1495,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[datetime.timedelta], IO[bytes]], **kwargs: Any + self, body: Union[list[datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1511,7 +1511,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1570,7 +1570,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[Any]: + def get(self, **kwargs: Any) -> list[Any]: """get. :return: list of any @@ -1583,12 +1583,12 @@ def get(self, **kwargs: Any) -> List[Any]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[Any]] = kwargs.pop("cls", None) + cls: ClsType[list[Any]] = kwargs.pop("cls", None) _request = build_unknown_value_get_request( headers=_headers, @@ -1618,7 +1618,7 @@ def get(self, **kwargs: Any) -> List[Any]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[Any], response.json()) + deserialized = _deserialize(list[Any], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1626,7 +1626,7 @@ def get(self, **kwargs: Any) -> List[Any]: return deserialized # type: ignore @overload - def put(self, body: List[Any], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[Any], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1655,7 +1655,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[Any], IO[bytes]], **kwargs: Any + self, body: Union[list[Any], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1671,7 +1671,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1730,7 +1730,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[_models.InnerModel]: + def get(self, **kwargs: Any) -> list[_models.InnerModel]: """get. :return: list of InnerModel @@ -1743,12 +1743,12 @@ def get(self, **kwargs: Any) -> List[_models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.InnerModel]] = kwargs.pop("cls", None) _request = build_model_value_get_request( headers=_headers, @@ -1778,7 +1778,7 @@ def get(self, **kwargs: Any) -> List[_models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[_models.InnerModel], response.json()) + deserialized = _deserialize(list[_models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1786,7 +1786,7 @@ def get(self, **kwargs: Any) -> List[_models.InnerModel]: return deserialized # type: ignore @overload - def put(self, body: List[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1815,7 +1815,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[_models.InnerModel], IO[bytes]], **kwargs: Any + self, body: Union[list[_models.InnerModel], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1831,7 +1831,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1890,7 +1890,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[float]: + def get(self, **kwargs: Any) -> list[float]: """get. :return: list of float @@ -1903,12 +1903,12 @@ def get(self, **kwargs: Any) -> List[float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[float]] = kwargs.pop("cls", None) + cls: ClsType[list[float]] = kwargs.pop("cls", None) _request = build_nullable_float_value_get_request( headers=_headers, @@ -1938,7 +1938,7 @@ def get(self, **kwargs: Any) -> List[float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[float], response.json()) + deserialized = _deserialize(list[float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1946,7 +1946,7 @@ def get(self, **kwargs: Any) -> List[float]: return deserialized # type: ignore @overload - def put(self, body: List[float], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1975,7 +1975,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[float], IO[bytes]], **kwargs: Any + self, body: Union[list[float], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1991,7 +1991,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2050,7 +2050,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[int]: + def get(self, **kwargs: Any) -> list[int]: """get. :return: list of int @@ -2063,12 +2063,12 @@ def get(self, **kwargs: Any) -> List[int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[int]] = kwargs.pop("cls", None) + cls: ClsType[list[int]] = kwargs.pop("cls", None) _request = build_nullable_int32_value_get_request( headers=_headers, @@ -2098,7 +2098,7 @@ def get(self, **kwargs: Any) -> List[int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[int], response.json()) + deserialized = _deserialize(list[int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2106,7 +2106,7 @@ def get(self, **kwargs: Any) -> List[int]: return deserialized # type: ignore @overload - def put(self, body: List[int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -2135,7 +2135,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[int], IO[bytes]], **kwargs: Any + self, body: Union[list[int], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -2151,7 +2151,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2210,7 +2210,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[bool]: + def get(self, **kwargs: Any) -> list[bool]: """get. :return: list of bool @@ -2223,12 +2223,12 @@ def get(self, **kwargs: Any) -> List[bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[bool]] = kwargs.pop("cls", None) + cls: ClsType[list[bool]] = kwargs.pop("cls", None) _request = build_nullable_boolean_value_get_request( headers=_headers, @@ -2258,7 +2258,7 @@ def get(self, **kwargs: Any) -> List[bool]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[bool], response.json()) + deserialized = _deserialize(list[bool], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2266,7 +2266,7 @@ def get(self, **kwargs: Any) -> List[bool]: return deserialized # type: ignore @overload - def put(self, body: List[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[bool], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -2295,7 +2295,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[bool], IO[bytes]], **kwargs: Any + self, body: Union[list[bool], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -2311,7 +2311,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2370,7 +2370,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[str]: + def get(self, **kwargs: Any) -> list[str]: """get. :return: list of str @@ -2383,12 +2383,12 @@ def get(self, **kwargs: Any) -> List[str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[str]] = kwargs.pop("cls", None) + cls: ClsType[list[str]] = kwargs.pop("cls", None) _request = build_nullable_string_value_get_request( headers=_headers, @@ -2418,7 +2418,7 @@ def get(self, **kwargs: Any) -> List[str]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[str], response.json()) + deserialized = _deserialize(list[str], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2426,7 +2426,7 @@ def get(self, **kwargs: Any) -> List[str]: return deserialized # type: ignore @overload - def put(self, body: List[str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[str], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -2455,7 +2455,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[str], IO[bytes]], **kwargs: Any + self, body: Union[list[str], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -2471,7 +2471,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -2530,7 +2530,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> List[_models.InnerModel]: + def get(self, **kwargs: Any) -> list[_models.InnerModel]: """get. :return: list of InnerModel @@ -2543,12 +2543,12 @@ def get(self, **kwargs: Any) -> List[_models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[_models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[list[_models.InnerModel]] = kwargs.pop("cls", None) _request = build_nullable_model_value_get_request( headers=_headers, @@ -2578,7 +2578,7 @@ def get(self, **kwargs: Any) -> List[_models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[_models.InnerModel], response.json()) + deserialized = _deserialize(list[_models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2586,7 +2586,7 @@ def get(self, **kwargs: Any) -> List[_models.InnerModel]: return deserialized # type: ignore @overload - def put(self, body: List[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: list[_models.InnerModel], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -2615,7 +2615,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[List[_models.InnerModel], IO[bytes]], **kwargs: Any + self, body: Union[list[_models.InnerModel], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -2631,7 +2631,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/model_base.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/serialization.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py index 1807c80aa64..4b5c72ec75d 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/aio/operations/_operations.py @@ -10,7 +10,7 @@ import datetime from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -58,7 +58,7 @@ from .._configuration import DictionaryClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class Int32ValueOperations: @@ -79,7 +79,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, int]: + async def get(self, **kwargs: Any) -> dict[str, int]: """get. :return: dict mapping str to int @@ -92,12 +92,12 @@ async def get(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_int32_value_get_request( headers=_headers, @@ -127,7 +127,7 @@ async def get(self, **kwargs: Any) -> Dict[str, int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, int], response.json()) + deserialized = _deserialize(dict[str, int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -135,7 +135,7 @@ async def get(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -163,7 +163,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, int], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: int} type or a IO[bytes] type. Required. @@ -178,7 +178,7 @@ async def put(self, body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -237,7 +237,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, int]: + async def get(self, **kwargs: Any) -> dict[str, int]: """get. :return: dict mapping str to int @@ -250,12 +250,12 @@ async def get(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_int64_value_get_request( headers=_headers, @@ -285,7 +285,7 @@ async def get(self, **kwargs: Any) -> Dict[str, int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, int], response.json()) + deserialized = _deserialize(dict[str, int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -293,7 +293,7 @@ async def get(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -321,7 +321,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, int], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: int} type or a IO[bytes] type. Required. @@ -336,7 +336,7 @@ async def put(self, body: Union[Dict[str, int], IO[bytes]], **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -395,7 +395,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, bool]: + async def get(self, **kwargs: Any) -> dict[str, bool]: """get. :return: dict mapping str to bool @@ -408,12 +408,12 @@ async def get(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_boolean_value_get_request( headers=_headers, @@ -443,7 +443,7 @@ async def get(self, **kwargs: Any) -> Dict[str, bool]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, bool], response.json()) + deserialized = _deserialize(dict[str, bool], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -451,7 +451,7 @@ async def get(self, **kwargs: Any) -> Dict[str, bool]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, bool], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, bool], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -479,7 +479,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, bool], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: bool} type or a IO[bytes] type. Required. @@ -494,7 +494,7 @@ async def put(self, body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -553,7 +553,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, str]: + async def get(self, **kwargs: Any) -> dict[str, str]: """get. :return: dict mapping str to str @@ -566,12 +566,12 @@ async def get(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_string_value_get_request( headers=_headers, @@ -601,7 +601,7 @@ async def get(self, **kwargs: Any) -> Dict[str, str]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, str], response.json()) + deserialized = _deserialize(dict[str, str], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -609,7 +609,7 @@ async def get(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -637,7 +637,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, str], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, str], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: str} type or a IO[bytes] type. Required. @@ -652,7 +652,7 @@ async def put(self, body: Union[Dict[str, str], IO[bytes]], **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -711,7 +711,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, float]: + async def get(self, **kwargs: Any) -> dict[str, float]: """get. :return: dict mapping str to float @@ -724,12 +724,12 @@ async def get(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_float32_value_get_request( headers=_headers, @@ -759,7 +759,7 @@ async def get(self, **kwargs: Any) -> Dict[str, float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, float], response.json()) + deserialized = _deserialize(dict[str, float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -767,7 +767,7 @@ async def get(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -795,7 +795,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, float], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: float} type or a IO[bytes] type. Required. @@ -810,7 +810,7 @@ async def put(self, body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -869,7 +869,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + async def get(self, **kwargs: Any) -> dict[str, datetime.datetime]: """get. :return: dict mapping str to datetime @@ -882,12 +882,12 @@ async def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_datetime_value_get_request( headers=_headers, @@ -917,7 +917,7 @@ async def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, datetime.datetime], response.json()) + deserialized = _deserialize(dict[str, datetime.datetime], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -926,7 +926,7 @@ async def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: @overload async def put( - self, body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -955,7 +955,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: datetime.datetime} type or a IO[bytes] type. Required. @@ -970,7 +970,7 @@ async def put(self, body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwar 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1029,7 +1029,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: + async def get(self, **kwargs: Any) -> dict[str, datetime.timedelta]: """get. :return: dict mapping str to timedelta @@ -1042,12 +1042,12 @@ async def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.timedelta]] = kwargs.pop("cls", None) _request = build_duration_value_get_request( headers=_headers, @@ -1077,7 +1077,7 @@ async def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, datetime.timedelta], response.json()) + deserialized = _deserialize(dict[str, datetime.timedelta], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1086,7 +1086,7 @@ async def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: @overload async def put( - self, body: Dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1115,7 +1115,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: datetime.timedelta} type or a IO[bytes] type. Required. @@ -1130,7 +1130,7 @@ async def put(self, body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1189,7 +1189,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, Any]: + async def get(self, **kwargs: Any) -> dict[str, Any]: """get. :return: dict mapping str to any @@ -1202,12 +1202,12 @@ async def get(self, **kwargs: Any) -> Dict[str, Any]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, Any]] = kwargs.pop("cls", None) _request = build_unknown_value_get_request( headers=_headers, @@ -1237,7 +1237,7 @@ async def get(self, **kwargs: Any) -> Dict[str, Any]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, Any], response.json()) + deserialized = _deserialize(dict[str, Any], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1245,7 +1245,7 @@ async def get(self, **kwargs: Any) -> Dict[str, Any]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, Any], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, Any], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1273,7 +1273,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, Any], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, Any], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: Any} type or a IO[bytes] type. Required. @@ -1288,7 +1288,7 @@ async def put(self, body: Union[Dict[str, Any], IO[bytes]], **kwargs: Any) -> No 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1347,7 +1347,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: + async def get(self, **kwargs: Any) -> dict[str, _models.InnerModel]: """get. :return: dict mapping str to InnerModel @@ -1360,12 +1360,12 @@ async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.InnerModel]] = kwargs.pop("cls", None) _request = build_model_value_get_request( headers=_headers, @@ -1395,7 +1395,7 @@ async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, _models.InnerModel], response.json()) + deserialized = _deserialize(dict[str, _models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1404,7 +1404,7 @@ async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: @overload async def put( - self, body: Dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1433,7 +1433,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: InnerModel} type or a IO[bytes] type. Required. @@ -1448,7 +1448,7 @@ async def put(self, body: Union[Dict[str, _models.InnerModel], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1507,7 +1507,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: + async def get(self, **kwargs: Any) -> dict[str, _models.InnerModel]: """get. :return: dict mapping str to InnerModel @@ -1520,12 +1520,12 @@ async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.InnerModel]] = kwargs.pop("cls", None) _request = build_recursive_model_value_get_request( headers=_headers, @@ -1555,7 +1555,7 @@ async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, _models.InnerModel], response.json()) + deserialized = _deserialize(dict[str, _models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1564,7 +1564,7 @@ async def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: @overload async def put( - self, body: Dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1593,7 +1593,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: InnerModel} type or a IO[bytes] type. Required. @@ -1608,7 +1608,7 @@ async def put(self, body: Union[Dict[str, _models.InnerModel], IO[bytes]], **kwa 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1667,7 +1667,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def get(self, **kwargs: Any) -> Dict[str, float]: + async def get(self, **kwargs: Any) -> dict[str, float]: """get. :return: dict mapping str to float @@ -1680,12 +1680,12 @@ async def get(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_nullable_float_value_get_request( headers=_headers, @@ -1715,7 +1715,7 @@ async def get(self, **kwargs: Any) -> Dict[str, float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, float], response.json()) + deserialized = _deserialize(dict[str, float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1723,7 +1723,7 @@ async def get(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @overload - async def put(self, body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: + async def put(self, body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1751,7 +1751,7 @@ async def put(self, body: IO[bytes], *, content_type: str = "application/json", """ @distributed_trace_async - async def put(self, body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> None: + async def put(self, body: Union[dict[str, float], IO[bytes]], **kwargs: Any) -> None: """put. :param body: Is either a {str: float} type or a IO[bytes] type. Required. @@ -1766,7 +1766,7 @@ async def put(self, body: Union[Dict[str, float], IO[bytes]], **kwargs: Any) -> 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py index f6891908fff..ea0abe809b6 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/models/_models.py @@ -7,7 +7,7 @@ # -------------------------------------------------------------------------- # pylint: disable=useless-super-delegation -from typing import Any, Dict, Mapping, Optional, TYPE_CHECKING, overload +from typing import Any, Mapping, Optional, TYPE_CHECKING, overload from .._utils.model_base import Model as _Model, rest_field @@ -26,7 +26,7 @@ class InnerModel(_Model): property: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) """Required string property. Required.""" - children: Optional[Dict[str, "_models.InnerModel"]] = rest_field( + children: Optional[dict[str, "_models.InnerModel"]] = rest_field( visibility=["read", "create", "update", "delete", "query"] ) @@ -35,7 +35,7 @@ def __init__( self, *, property: str, # pylint: disable=redefined-builtin - children: Optional[Dict[str, "_models.InnerModel"]] = None, + children: Optional[dict[str, "_models.InnerModel"]] = None, ) -> None: ... @overload diff --git a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py index c7c01f0aad5..1b756f00038 100644 --- a/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-dictionary/typetest/dictionary/operations/_operations.py @@ -10,7 +10,7 @@ import datetime from io import IOBase import json -from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload +from typing import Any, Callable, IO, Optional, TypeVar, Union, overload from azure.core import PipelineClient from azure.core.exceptions import ( @@ -34,7 +34,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -366,7 +366,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, int]: + def get(self, **kwargs: Any) -> dict[str, int]: """get. :return: dict mapping str to int @@ -379,12 +379,12 @@ def get(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_int32_value_get_request( headers=_headers, @@ -414,7 +414,7 @@ def get(self, **kwargs: Any) -> Dict[str, int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, int], response.json()) + deserialized = _deserialize(dict[str, int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -422,7 +422,7 @@ def get(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -451,7 +451,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, int], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, int], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -467,7 +467,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -526,7 +526,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, int]: + def get(self, **kwargs: Any) -> dict[str, int]: """get. :return: dict mapping str to int @@ -539,12 +539,12 @@ def get(self, **kwargs: Any) -> Dict[str, int]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, int]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, int]] = kwargs.pop("cls", None) _request = build_int64_value_get_request( headers=_headers, @@ -574,7 +574,7 @@ def get(self, **kwargs: Any) -> Dict[str, int]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, int], response.json()) + deserialized = _deserialize(dict[str, int], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -582,7 +582,7 @@ def get(self, **kwargs: Any) -> Dict[str, int]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, int], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -611,7 +611,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, int], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, int], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -627,7 +627,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -686,7 +686,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, bool]: + def get(self, **kwargs: Any) -> dict[str, bool]: """get. :return: dict mapping str to bool @@ -699,12 +699,12 @@ def get(self, **kwargs: Any) -> Dict[str, bool]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, bool]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, bool]] = kwargs.pop("cls", None) _request = build_boolean_value_get_request( headers=_headers, @@ -734,7 +734,7 @@ def get(self, **kwargs: Any) -> Dict[str, bool]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, bool], response.json()) + deserialized = _deserialize(dict[str, bool], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -742,7 +742,7 @@ def get(self, **kwargs: Any) -> Dict[str, bool]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, bool], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, bool], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -771,7 +771,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, bool], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, bool], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -787,7 +787,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -846,7 +846,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, str]: + def get(self, **kwargs: Any) -> dict[str, str]: """get. :return: dict mapping str to str @@ -859,12 +859,12 @@ def get(self, **kwargs: Any) -> Dict[str, str]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, str]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, str]] = kwargs.pop("cls", None) _request = build_string_value_get_request( headers=_headers, @@ -894,7 +894,7 @@ def get(self, **kwargs: Any) -> Dict[str, str]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, str], response.json()) + deserialized = _deserialize(dict[str, str], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -902,7 +902,7 @@ def get(self, **kwargs: Any) -> Dict[str, str]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, str], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -931,7 +931,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, str], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, str], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -947,7 +947,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1006,7 +1006,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, float]: + def get(self, **kwargs: Any) -> dict[str, float]: """get. :return: dict mapping str to float @@ -1019,12 +1019,12 @@ def get(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_float32_value_get_request( headers=_headers, @@ -1054,7 +1054,7 @@ def get(self, **kwargs: Any) -> Dict[str, float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, float], response.json()) + deserialized = _deserialize(dict[str, float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1062,7 +1062,7 @@ def get(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1091,7 +1091,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, float], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, float], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1107,7 +1107,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1166,7 +1166,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: + def get(self, **kwargs: Any) -> dict[str, datetime.datetime]: """get. :return: dict mapping str to datetime @@ -1179,12 +1179,12 @@ def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.datetime]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.datetime]] = kwargs.pop("cls", None) _request = build_datetime_value_get_request( headers=_headers, @@ -1214,7 +1214,7 @@ def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, datetime.datetime], response.json()) + deserialized = _deserialize(dict[str, datetime.datetime], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1222,7 +1222,7 @@ def get(self, **kwargs: Any) -> Dict[str, datetime.datetime]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, datetime.datetime], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1251,7 +1251,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, datetime.datetime], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, datetime.datetime], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1267,7 +1267,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1326,7 +1326,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: + def get(self, **kwargs: Any) -> dict[str, datetime.timedelta]: """get. :return: dict mapping str to timedelta @@ -1339,12 +1339,12 @@ def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, datetime.timedelta]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, datetime.timedelta]] = kwargs.pop("cls", None) _request = build_duration_value_get_request( headers=_headers, @@ -1374,7 +1374,7 @@ def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, datetime.timedelta], response.json()) + deserialized = _deserialize(dict[str, datetime.timedelta], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1383,7 +1383,7 @@ def get(self, **kwargs: Any) -> Dict[str, datetime.timedelta]: @overload def put( - self, body: Dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, datetime.timedelta], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1413,7 +1413,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, datetime.timedelta], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1429,7 +1429,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1488,7 +1488,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, Any]: + def get(self, **kwargs: Any) -> dict[str, Any]: """get. :return: dict mapping str to any @@ -1501,12 +1501,12 @@ def get(self, **kwargs: Any) -> Dict[str, Any]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, Any]] = kwargs.pop("cls", None) _request = build_unknown_value_get_request( headers=_headers, @@ -1536,7 +1536,7 @@ def get(self, **kwargs: Any) -> Dict[str, Any]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, Any], response.json()) + deserialized = _deserialize(dict[str, Any], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1544,7 +1544,7 @@ def get(self, **kwargs: Any) -> Dict[str, Any]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, Any], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, Any], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -1573,7 +1573,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, Any], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, Any], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1589,7 +1589,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1648,7 +1648,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: + def get(self, **kwargs: Any) -> dict[str, _models.InnerModel]: """get. :return: dict mapping str to InnerModel @@ -1661,12 +1661,12 @@ def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.InnerModel]] = kwargs.pop("cls", None) _request = build_model_value_get_request( headers=_headers, @@ -1696,7 +1696,7 @@ def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, _models.InnerModel], response.json()) + deserialized = _deserialize(dict[str, _models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1705,7 +1705,7 @@ def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: @overload def put( - self, body: Dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1735,7 +1735,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1751,7 +1751,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1810,7 +1810,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: + def get(self, **kwargs: Any) -> dict[str, _models.InnerModel]: """get. :return: dict mapping str to InnerModel @@ -1823,12 +1823,12 @@ def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, _models.InnerModel]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, _models.InnerModel]] = kwargs.pop("cls", None) _request = build_recursive_model_value_get_request( headers=_headers, @@ -1858,7 +1858,7 @@ def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, _models.InnerModel], response.json()) + deserialized = _deserialize(dict[str, _models.InnerModel], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1867,7 +1867,7 @@ def get(self, **kwargs: Any) -> Dict[str, _models.InnerModel]: @overload def put( - self, body: Dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any + self, body: dict[str, _models.InnerModel], *, content_type: str = "application/json", **kwargs: Any ) -> None: """put. @@ -1897,7 +1897,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, _models.InnerModel], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -1913,7 +1913,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1972,7 +1972,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def get(self, **kwargs: Any) -> Dict[str, float]: + def get(self, **kwargs: Any) -> dict[str, float]: """get. :return: dict mapping str to float @@ -1985,12 +1985,12 @@ def get(self, **kwargs: Any) -> Dict[str, float]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[Dict[str, float]] = kwargs.pop("cls", None) + cls: ClsType[dict[str, float]] = kwargs.pop("cls", None) _request = build_nullable_float_value_get_request( headers=_headers, @@ -2020,7 +2020,7 @@ def get(self, **kwargs: Any) -> Dict[str, float]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(Dict[str, float], response.json()) + deserialized = _deserialize(dict[str, float], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -2028,7 +2028,7 @@ def get(self, **kwargs: Any) -> Dict[str, float]: return deserialized # type: ignore @overload - def put(self, body: Dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: + def put(self, body: dict[str, float], *, content_type: str = "application/json", **kwargs: Any) -> None: """put. :param body: Required. @@ -2057,7 +2057,7 @@ def put(self, body: IO[bytes], *, content_type: str = "application/json", **kwar @distributed_trace def put( # pylint: disable=inconsistent-return-statements - self, body: Union[Dict[str, float], IO[bytes]], **kwargs: Any + self, body: Union[dict[str, float], IO[bytes]], **kwargs: Any ) -> None: """put. @@ -2073,7 +2073,7 @@ def put( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/model_base.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/model_base.py index 49d5c725938..a64bcbd7751 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/model_base.py +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/model_base.py @@ -345,7 +345,7 @@ def _get_model(module_name: str, model_name: str): class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: + def __init__(self, data: dict[str, typing.Any]) -> None: self._data = data def __contains__(self, key: typing.Any) -> bool: @@ -425,7 +425,7 @@ def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: return self._data.pop(key) return self._data.pop(key, default) - def popitem(self) -> typing.Tuple[str, typing.Any]: + def popitem(self) -> tuple[str, typing.Any]: """ Removes and returns some (key, value) pair :returns: The (key, value) pair. @@ -513,9 +513,7 @@ def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-m return o -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: +def _get_rest_field(attr_to_rest_field: dict[str, "_RestField"], rest_name: str) -> typing.Optional["_RestField"]: try: return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) except StopIteration: @@ -538,7 +536,7 @@ class Model(_MyMutableMapping): _is_model = True # label whether current class's _attr_to_rest_field has been calculated # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() + _calculated: set[str] = set() def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: class_name = self.__class__.__name__ @@ -623,7 +621,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property + attr_to_rest_field: dict[str, _RestField] = { # map attribute name to rest_field property k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") } annotations = { @@ -638,7 +636,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) if not rf._rest_name_input: rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) + cls._attr_to_rest_field: dict[str, _RestField] = dict(attr_to_rest_field.items()) cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") return super().__new__(cls) @@ -680,7 +678,7 @@ def _deserialize(cls, data, exist_discriminators): mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member return mapped_cls._deserialize(data, exist_discriminators) - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: + def as_dict(self, *, exclude_readonly: bool = False) -> dict[str, typing.Any]: """Return a dict that can be turned into json using json.dump. :keyword bool exclude_readonly: Whether to remove the readonly properties. @@ -740,7 +738,7 @@ def _deserialize_with_union(deserializers, obj): def _deserialize_dict( value_deserializer: typing.Optional[typing.Callable], module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], + obj: dict[typing.Any, typing.Any], ): if obj is None: return obj @@ -750,7 +748,7 @@ def _deserialize_dict( def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], + entry_deserializers: list[typing.Optional[typing.Callable]], module: typing.Optional[str], obj, ): @@ -771,7 +769,7 @@ def _deserialize_sequence( return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: +def _sorted_annotations(types: list[typing.Any]) -> list[typing.Any]: return sorted( types, key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), @@ -843,7 +841,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur return functools.partial(_deserialize_with_union, deserializers) try: - if annotation._name == "Dict": # pyright: ignore + if annotation.__name__ == "dict": # pyright: ignore value_deserializer = _get_deserialize_callable_from_annotation( annotation.__args__[1], module, rf # pyright: ignore ) @@ -856,7 +854,7 @@ def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-retur except (AttributeError, IndexError): pass try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore + if annotation.__name__ in ["list", "set", "tuple", "sequence"]: # pyright: ignore if len(annotation.__args__) > 1: # pyright: ignore entry_deserializers = [ _get_deserialize_callable_from_annotation(dt, module, rf) @@ -974,11 +972,11 @@ def __init__( name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ): self._type = type self._rest_name_input = name @@ -1036,11 +1034,11 @@ def rest_field( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, + visibility: typing.Optional[list[str]] = None, default: typing.Any = _UNSET, format: typing.Optional[str] = None, is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField( name=name, @@ -1057,8 +1055,8 @@ def rest_discriminator( *, name: typing.Optional[str] = None, type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, + visibility: typing.Optional[list[str]] = None, + xml: typing.Optional[dict[str, typing.Any]] = None, ) -> typing.Any: return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) @@ -1077,9 +1075,9 @@ def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: def _get_element( o: typing.Any, exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, + parent_meta: typing.Optional[dict[str, typing.Any]] = None, wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: +) -> typing.Union[ET.Element, list[ET.Element]]: if _is_model(o): model_meta = getattr(o, "_xml", {}) @@ -1168,7 +1166,7 @@ def _get_element( def _get_wrapped_element( v: typing.Any, exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], + meta: typing.Optional[dict[str, typing.Any]], ) -> ET.Element: wrapped_element = _create_xml_element( meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None @@ -1211,7 +1209,7 @@ def _deserialize_xml( def _convert_element(e: ET.Element): # dict case if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} + dict_result: dict[str, typing.Any] = {} for child in e: if dict_result.get(child.tag) is not None: if isinstance(dict_result[child.tag], list): @@ -1224,7 +1222,7 @@ def _convert_element(e: ET.Element): return dict_result # array case if len(e) > 0: - array_result: typing.List[typing.Any] = [] + array_result: list[typing.Any] = [] for child in e: array_result.append(_convert_element(child)) return array_result diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/serialization.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/serialization.py index eb86ea23c96..e81921cbb01 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/serialization.py +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/_utils/serialization.py @@ -21,7 +21,6 @@ import sys import codecs from typing import ( - Dict, Any, cast, Optional, @@ -31,7 +30,6 @@ Mapping, Callable, MutableMapping, - List, ) try: @@ -229,12 +227,12 @@ class Model: serialization and deserialization. """ - _subtype_map: Dict[str, Dict[str, Any]] = {} - _attribute_map: Dict[str, Dict[str, Any]] = {} - _validation: Dict[str, Dict[str, Any]] = {} + _subtype_map: dict[str, dict[str, Any]] = {} + _attribute_map: dict[str, dict[str, Any]] = {} + _validation: dict[str, dict[str, Any]] = {} def __init__(self, **kwargs: Any) -> None: - self.additional_properties: Optional[Dict[str, Any]] = {} + self.additional_properties: Optional[dict[str, Any]] = {} for k in kwargs: # pylint: disable=consider-using-dict-items if k not in self._attribute_map: _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) @@ -311,7 +309,7 @@ def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: def as_dict( self, keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, + key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer, **kwargs: Any ) -> JSON: """Return a dict that can be serialized using json.dump. @@ -380,7 +378,7 @@ def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: def from_dict( cls, data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, + key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None, content_type: Optional[str] = None, ) -> Self: """Parse a dict using given key extractor return a model. @@ -414,7 +412,7 @@ def _flatten_subtype(cls, key, objects): return {} result = dict(cls._subtype_map[key]) for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access + result |= objects[valuetype]._flatten_subtype(key, objects) # pylint: disable=protected-access return result @classmethod @@ -528,7 +526,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "[]": self.serialize_iter, "{}": self.serialize_dict, } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_transformer = full_restapi_key_transformer self.client_side_validation = True @@ -579,7 +577,7 @@ def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, to if attr_name == "additional_properties" and attr_desc["key"] == "": if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) + serialized |= target_obj.additional_properties continue try: @@ -1184,7 +1182,7 @@ def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argumen while "." in key: # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) + dict_keys = cast(list[str], _FLATTEN.split(key)) if len(dict_keys) == 1: key = _decode_attribute_map_key(dict_keys[0]) break @@ -1386,7 +1384,7 @@ def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: "duration": (isodate.Duration, datetime.timedelta), "iso-8601": (datetime.datetime), } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} + self.dependencies: dict[str, type] = dict(classes) if classes else {} self.key_extractors = [rest_key_extractor, xml_key_extractor] # Additional properties only works if the "rest_key_extractor" is used to # extract the keys. Making it to work whatever the key extractor is too much diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py index ad52cfbe2a3..abaf849c54a 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/aio/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import decimal import json -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import AsyncPipelineClient from azure.core.exceptions import ( @@ -50,7 +50,7 @@ from .._configuration import ScalarClientConfiguration T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, dict[str, Any]], Any]] class StringOperations: @@ -84,7 +84,7 @@ async def get(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -145,7 +145,7 @@ async def put(self, body: str, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -212,7 +212,7 @@ async def get(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -273,7 +273,7 @@ async def put(self, body: bool, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -340,7 +340,7 @@ async def get(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -401,7 +401,7 @@ async def put(self, body: Any, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -468,7 +468,7 @@ async def response_body(self, **kwargs: Any) -> decimal.Decimal: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -529,7 +529,7 @@ async def request_body(self, body: decimal.Decimal, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -580,7 +580,7 @@ async def request_parameter(self, *, value: decimal.Decimal, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -643,7 +643,7 @@ async def response_body(self, **kwargs: Any) -> decimal.Decimal: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -704,7 +704,7 @@ async def request_body(self, body: decimal.Decimal, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -755,7 +755,7 @@ async def request_parameter(self, *, value: decimal.Decimal, **kwargs: Any) -> N 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -805,7 +805,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: + async def prepare_verify(self, **kwargs: Any) -> list[decimal.Decimal]: """prepare_verify. :return: list of decimal.Decimal @@ -818,12 +818,12 @@ async def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[decimal.Decimal]] = kwargs.pop("cls", None) + cls: ClsType[list[decimal.Decimal]] = kwargs.pop("cls", None) _request = build_decimal_verify_prepare_verify_request( headers=_headers, @@ -853,7 +853,7 @@ async def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[decimal.Decimal], response.json()) + deserialized = _deserialize(list[decimal.Decimal], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -876,7 +876,7 @@ async def verify(self, body: decimal.Decimal, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -930,7 +930,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace_async - async def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: + async def prepare_verify(self, **kwargs: Any) -> list[decimal.Decimal]: """prepare_verify. :return: list of decimal.Decimal @@ -943,12 +943,12 @@ async def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[decimal.Decimal]] = kwargs.pop("cls", None) + cls: ClsType[list[decimal.Decimal]] = kwargs.pop("cls", None) _request = build_decimal128_verify_prepare_verify_request( headers=_headers, @@ -978,7 +978,7 @@ async def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[decimal.Decimal], response.json()) + deserialized = _deserialize(list[decimal.Decimal], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1001,7 +1001,7 @@ async def verify(self, body: decimal.Decimal, **kwargs: Any) -> None: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py index 1dea3bb6c30..335809a0e8d 100644 --- a/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py +++ b/packages/typespec-python/test/azure/generated/typetest-scalar/typetest/scalar/operations/_operations.py @@ -9,7 +9,7 @@ from collections.abc import MutableMapping import decimal import json -from typing import Any, Callable, Dict, List, Optional, TypeVar +from typing import Any, Callable, Optional, TypeVar from azure.core import PipelineClient from azure.core.exceptions import ( @@ -32,7 +32,7 @@ from .._utils.serialization import Deserializer, Serializer T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] +ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, dict[str, Any]], Any]] _SERIALIZER = Serializer() _SERIALIZER.client_side_validation = False @@ -286,7 +286,7 @@ def get(self, **kwargs: Any) -> str: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -347,7 +347,7 @@ def put(self, body: str, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -414,7 +414,7 @@ def get(self, **kwargs: Any) -> bool: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -475,7 +475,7 @@ def put(self, body: bool, **kwargs: Any) -> None: # pylint: disable=inconsisten 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -542,7 +542,7 @@ def get(self, **kwargs: Any) -> Any: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -603,7 +603,7 @@ def put(self, body: Any, **kwargs: Any) -> None: # pylint: disable=inconsistent 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -670,7 +670,7 @@ def response_body(self, **kwargs: Any) -> decimal.Decimal: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -733,7 +733,7 @@ def request_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -786,7 +786,7 @@ def request_parameter( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -849,7 +849,7 @@ def response_body(self, **kwargs: Any) -> decimal.Decimal: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -912,7 +912,7 @@ def request_body( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -965,7 +965,7 @@ def request_parameter( # pylint: disable=inconsistent-return-statements 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} @@ -1015,7 +1015,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: + def prepare_verify(self, **kwargs: Any) -> list[decimal.Decimal]: """prepare_verify. :return: list of decimal.Decimal @@ -1028,12 +1028,12 @@ def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[decimal.Decimal]] = kwargs.pop("cls", None) + cls: ClsType[list[decimal.Decimal]] = kwargs.pop("cls", None) _request = build_decimal_verify_prepare_verify_request( headers=_headers, @@ -1063,7 +1063,7 @@ def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[decimal.Decimal], response.json()) + deserialized = _deserialize(list[decimal.Decimal], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1086,7 +1086,7 @@ def verify(self, body: decimal.Decimal, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} @@ -1140,7 +1140,7 @@ def __init__(self, *args, **kwargs) -> None: self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") @distributed_trace - def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: + def prepare_verify(self, **kwargs: Any) -> list[decimal.Decimal]: """prepare_verify. :return: list of decimal.Decimal @@ -1153,12 +1153,12 @@ def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = kwargs.pop("headers", {}) or {} _params = kwargs.pop("params", {}) or {} - cls: ClsType[List[decimal.Decimal]] = kwargs.pop("cls", None) + cls: ClsType[list[decimal.Decimal]] = kwargs.pop("cls", None) _request = build_decimal128_verify_prepare_verify_request( headers=_headers, @@ -1188,7 +1188,7 @@ def prepare_verify(self, **kwargs: Any) -> List[decimal.Decimal]: if _stream: deserialized = response.iter_bytes() else: - deserialized = _deserialize(List[decimal.Decimal], response.json()) + deserialized = _deserialize(list[decimal.Decimal], response.json()) if cls: return cls(pipeline_response, deserialized, {}) # type: ignore @@ -1211,7 +1211,7 @@ def verify(self, body: decimal.Decimal, **kwargs: Any) -> None: # pylint: disab 409: ResourceExistsError, 304: ResourceNotModifiedError, } - error_map.update(kwargs.pop("error_map", {}) or {}) + error_map |= kwargs.pop("error_map", {}) or {} _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = kwargs.pop("params", {}) or {} diff --git a/packages/typespec-python/test/azure/generated/typetest-union/CHANGELOG.md b/packages/typespec-python/test/azure/generated/typetest-union/CHANGELOG.md deleted file mode 100644 index 628743d283a..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/CHANGELOG.md +++ /dev/null @@ -1,5 +0,0 @@ -# Release History - -## 1.0.0b1 (1970-01-01) - -- Initial version diff --git a/packages/typespec-python/test/azure/generated/typetest-union/LICENSE b/packages/typespec-python/test/azure/generated/typetest-union/LICENSE deleted file mode 100644 index 63447fd8bbb..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) Microsoft Corporation. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-union/MANIFEST.in b/packages/typespec-python/test/azure/generated/typetest-union/MANIFEST.in deleted file mode 100644 index 607206a947f..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include *.md -include LICENSE -include typetest/union/py.typed -recursive-include tests *.py -recursive-include samples *.py *.md -include typetest/__init__.py diff --git a/packages/typespec-python/test/azure/generated/typetest-union/README.md b/packages/typespec-python/test/azure/generated/typetest-union/README.md deleted file mode 100644 index 0451824ed71..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Typetest Union client library for Python - - -## Getting started - -### Install the package - -```bash -python -m pip install typetest-union -``` - -#### Prequisites - -- Python 3.9 or later is required to use this package. -- You need an [Azure subscription][azure_sub] to use this package. -- An existing Typetest Union instance. - - -## Contributing - -This project welcomes contributions and suggestions. Most contributions require -you to agree to a Contributor License Agreement (CLA) declaring that you have -the right to, and actually do, grant us the rights to use your contribution. -For details, visit https://cla.microsoft.com. - -When you submit a pull request, a CLA-bot will automatically determine whether -you need to provide a CLA and decorate the PR appropriately (e.g., label, -comment). Simply follow the instructions provided by the bot. You will only -need to do this once across all repos using our CLA. - -This project has adopted the -[Microsoft Open Source Code of Conduct][code_of_conduct]. For more information, -see the Code of Conduct FAQ or contact opencode@microsoft.com with any -additional questions or comments. - - -[code_of_conduct]: https://opensource.microsoft.com/codeofconduct/ -[authenticate_with_token]: https://docs.microsoft.com/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token -[azure_identity_credentials]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#credentials -[azure_identity_pip]: https://pypi.org/project/azure-identity/ -[default_azure_credential]: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity#defaultazurecredential -[pip]: https://pypi.org/project/pip/ -[azure_sub]: https://azure.microsoft.com/free/ diff --git a/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json b/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json deleted file mode 100644 index b5847de2fd0..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/apiview-properties.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "CrossLanguagePackageId": "Type.Union", - "CrossLanguageDefinitionId": { - "typetest.union.models.Cat": "Type.Union.Cat", - "typetest.union.models.Dog": "Type.Union.Dog", - "typetest.union.models.EnumsOnlyCases": "Type.Union.EnumsOnlyCases", - "typetest.union.models.GetResponse": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse1": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse2": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse3": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse4": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse5": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse6": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse7": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse8": "Type.Union.get.Response.anonymous", - "typetest.union.models.GetResponse9": "Type.Union.get.Response.anonymous", - "typetest.union.models.MixedLiteralsCases": "Type.Union.MixedLiteralsCases", - "typetest.union.models.MixedTypesCases": "Type.Union.MixedTypesCases", - "typetest.union.models.StringAndArrayCases": "Type.Union.StringAndArrayCases", - "typetest.union.models.StringExtensibleNamedUnion": "Type.Union.StringExtensibleNamedUnion", - "typetest.union.operations.StringsOnlyOperations.get": "Type.Union.StringsOnly.get", - "typetest.union.aio.operations.StringsOnlyOperations.get": "Type.Union.StringsOnly.get", - "typetest.union.operations.StringsOnlyOperations.send": "Type.Union.StringsOnly.send", - "typetest.union.aio.operations.StringsOnlyOperations.send": "Type.Union.StringsOnly.send", - "typetest.union.operations.StringExtensibleOperations.get": "Type.Union.StringExtensible.get", - "typetest.union.aio.operations.StringExtensibleOperations.get": "Type.Union.StringExtensible.get", - "typetest.union.operations.StringExtensibleOperations.send": "Type.Union.StringExtensible.send", - "typetest.union.aio.operations.StringExtensibleOperations.send": "Type.Union.StringExtensible.send", - "typetest.union.operations.StringExtensibleNamedOperations.get": "Type.Union.StringExtensibleNamed.get", - "typetest.union.aio.operations.StringExtensibleNamedOperations.get": "Type.Union.StringExtensibleNamed.get", - "typetest.union.operations.StringExtensibleNamedOperations.send": "Type.Union.StringExtensibleNamed.send", - "typetest.union.aio.operations.StringExtensibleNamedOperations.send": "Type.Union.StringExtensibleNamed.send", - "typetest.union.operations.IntsOnlyOperations.get": "Type.Union.IntsOnly.get", - "typetest.union.aio.operations.IntsOnlyOperations.get": "Type.Union.IntsOnly.get", - "typetest.union.operations.IntsOnlyOperations.send": "Type.Union.IntsOnly.send", - "typetest.union.aio.operations.IntsOnlyOperations.send": "Type.Union.IntsOnly.send", - "typetest.union.operations.FloatsOnlyOperations.get": "Type.Union.FloatsOnly.get", - "typetest.union.aio.operations.FloatsOnlyOperations.get": "Type.Union.FloatsOnly.get", - "typetest.union.operations.FloatsOnlyOperations.send": "Type.Union.FloatsOnly.send", - "typetest.union.aio.operations.FloatsOnlyOperations.send": "Type.Union.FloatsOnly.send", - "typetest.union.operations.ModelsOnlyOperations.get": "Type.Union.ModelsOnly.get", - "typetest.union.aio.operations.ModelsOnlyOperations.get": "Type.Union.ModelsOnly.get", - "typetest.union.operations.ModelsOnlyOperations.send": "Type.Union.ModelsOnly.send", - "typetest.union.aio.operations.ModelsOnlyOperations.send": "Type.Union.ModelsOnly.send", - "typetest.union.operations.EnumsOnlyOperations.get": "Type.Union.EnumsOnly.get", - "typetest.union.aio.operations.EnumsOnlyOperations.get": "Type.Union.EnumsOnly.get", - "typetest.union.operations.EnumsOnlyOperations.send": "Type.Union.EnumsOnly.send", - "typetest.union.aio.operations.EnumsOnlyOperations.send": "Type.Union.EnumsOnly.send", - "typetest.union.operations.StringAndArrayOperations.get": "Type.Union.StringAndArray.get", - "typetest.union.aio.operations.StringAndArrayOperations.get": "Type.Union.StringAndArray.get", - "typetest.union.operations.StringAndArrayOperations.send": "Type.Union.StringAndArray.send", - "typetest.union.aio.operations.StringAndArrayOperations.send": "Type.Union.StringAndArray.send", - "typetest.union.operations.MixedLiteralsOperations.get": "Type.Union.MixedLiterals.get", - "typetest.union.aio.operations.MixedLiteralsOperations.get": "Type.Union.MixedLiterals.get", - "typetest.union.operations.MixedLiteralsOperations.send": "Type.Union.MixedLiterals.send", - "typetest.union.aio.operations.MixedLiteralsOperations.send": "Type.Union.MixedLiterals.send", - "typetest.union.operations.MixedTypesOperations.get": "Type.Union.MixedTypes.get", - "typetest.union.aio.operations.MixedTypesOperations.get": "Type.Union.MixedTypes.get", - "typetest.union.operations.MixedTypesOperations.send": "Type.Union.MixedTypes.send", - "typetest.union.aio.operations.MixedTypesOperations.send": "Type.Union.MixedTypes.send" - } -} \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-union/dev_requirements.txt b/packages/typespec-python/test/azure/generated/typetest-union/dev_requirements.txt deleted file mode 100644 index 10548647144..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/dev_requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ --e ../../../tools/azure-sdk-tools -../../core/azure-core -aiohttp \ No newline at end of file diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/conftest.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/conftest.py deleted file mode 100644 index 5e28d6377c8..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/conftest.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import os -import pytest -from dotenv import load_dotenv -from devtools_testutils import ( - test_proxy, - add_general_regex_sanitizer, - add_body_key_sanitizer, - add_header_regex_sanitizer, -) - -load_dotenv() - - -# For security, please avoid record sensitive identity information in recordings -@pytest.fixture(scope="session", autouse=True) -def add_sanitizers(test_proxy): - union_subscription_id = os.environ.get("UNION_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000") - union_tenant_id = os.environ.get("UNION_TENANT_ID", "00000000-0000-0000-0000-000000000000") - union_client_id = os.environ.get("UNION_CLIENT_ID", "00000000-0000-0000-0000-000000000000") - union_client_secret = os.environ.get("UNION_CLIENT_SECRET", "00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=union_subscription_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=union_tenant_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=union_client_id, value="00000000-0000-0000-0000-000000000000") - add_general_regex_sanitizer(regex=union_client_secret, value="00000000-0000-0000-0000-000000000000") - - add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]") - add_header_regex_sanitizer(key="Cookie", value="cookie;") - add_body_key_sanitizer(json_path="$..access_token", value="access_token") diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_enums_only_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_enums_only_operations.py deleted file mode 100644 index e35f531e7af..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_enums_only_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionEnumsOnlyOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_enums_only_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.enums_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_enums_only_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.enums_only.send( - body={"prop": {"lr": "left", "ud": "up"}}, - prop={"lr": "left", "ud": "up"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_enums_only_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_enums_only_operations_async.py deleted file mode 100644 index 7927950425b..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_enums_only_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionEnumsOnlyOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_enums_only_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.enums_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_enums_only_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.enums_only.send( - body={"prop": {"lr": "left", "ud": "up"}}, - prop={"lr": "left", "ud": "up"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_floats_only_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_floats_only_operations.py deleted file mode 100644 index 1f6b8c84fc7..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_floats_only_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionFloatsOnlyOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_floats_only_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.floats_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_floats_only_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.floats_only.send( - body={"prop": 1.1}, - prop=1.1, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_floats_only_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_floats_only_operations_async.py deleted file mode 100644 index 95c162de097..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_floats_only_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionFloatsOnlyOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_floats_only_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.floats_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_floats_only_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.floats_only.send( - body={"prop": 1.1}, - prop=1.1, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_ints_only_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_ints_only_operations.py deleted file mode 100644 index 8eb6efc6d13..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_ints_only_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionIntsOnlyOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_ints_only_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.ints_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_ints_only_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.ints_only.send( - body={"prop": 1}, - prop=1, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_ints_only_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_ints_only_operations_async.py deleted file mode 100644 index 876727cdc0c..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_ints_only_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionIntsOnlyOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_ints_only_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.ints_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_ints_only_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.ints_only.send( - body={"prop": 1}, - prop=1, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_literals_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_literals_operations.py deleted file mode 100644 index 2b46b3270d9..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_literals_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionMixedLiteralsOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_mixed_literals_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.mixed_literals.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_mixed_literals_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.mixed_literals.send( - body={"prop": {"booleanLiteral": "a", "floatLiteral": "a", "intLiteral": "a", "stringLiteral": "a"}}, - prop={"booleanLiteral": "a", "floatLiteral": "a", "intLiteral": "a", "stringLiteral": "a"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_literals_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_literals_operations_async.py deleted file mode 100644 index 356f7496bf0..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_literals_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionMixedLiteralsOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_mixed_literals_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.mixed_literals.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_mixed_literals_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.mixed_literals.send( - body={"prop": {"booleanLiteral": "a", "floatLiteral": "a", "intLiteral": "a", "stringLiteral": "a"}}, - prop={"booleanLiteral": "a", "floatLiteral": "a", "intLiteral": "a", "stringLiteral": "a"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_types_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_types_operations.py deleted file mode 100644 index 325317368c6..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_types_operations.py +++ /dev/null @@ -1,48 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionMixedTypesOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_mixed_types_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.mixed_types.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_mixed_types_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.mixed_types.send( - body={ - "prop": { - "array": [{"name": "str"}], - "boolean": {"name": "str"}, - "int": {"name": "str"}, - "literal": {"name": "str"}, - "model": {"name": "str"}, - } - }, - prop={ - "array": [{"name": "str"}], - "boolean": {"name": "str"}, - "int": {"name": "str"}, - "literal": {"name": "str"}, - "model": {"name": "str"}, - }, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_types_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_types_operations_async.py deleted file mode 100644 index b146ea74056..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_mixed_types_operations_async.py +++ /dev/null @@ -1,49 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionMixedTypesOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_mixed_types_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.mixed_types.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_mixed_types_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.mixed_types.send( - body={ - "prop": { - "array": [{"name": "str"}], - "boolean": {"name": "str"}, - "int": {"name": "str"}, - "literal": {"name": "str"}, - "model": {"name": "str"}, - } - }, - prop={ - "array": [{"name": "str"}], - "boolean": {"name": "str"}, - "int": {"name": "str"}, - "literal": {"name": "str"}, - "model": {"name": "str"}, - }, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_models_only_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_models_only_operations.py deleted file mode 100644 index e932af10a22..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_models_only_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionModelsOnlyOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_models_only_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.models_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_models_only_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.models_only.send( - body={"prop": {"name": "str"}}, - prop={"name": "str"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_models_only_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_models_only_operations_async.py deleted file mode 100644 index 1ee10f9b68e..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_models_only_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionModelsOnlyOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_models_only_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.models_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_models_only_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.models_only.send( - body={"prop": {"name": "str"}}, - prop={"name": "str"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_and_array_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_and_array_operations.py deleted file mode 100644 index 4e68cad1acd..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_and_array_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringAndArrayOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_string_and_array_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.string_and_array.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_string_and_array_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.string_and_array.send( - body={"prop": {"array": "str", "string": "str"}}, - prop={"array": "str", "string": "str"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_and_array_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_and_array_operations_async.py deleted file mode 100644 index 7692fd0bd05..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_and_array_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringAndArrayOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_string_and_array_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.string_and_array.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_string_and_array_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.string_and_array.send( - body={"prop": {"array": "str", "string": "str"}}, - prop={"array": "str", "string": "str"}, - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_named_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_named_operations.py deleted file mode 100644 index b05ecc2f0c7..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_named_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringExtensibleNamedOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_string_extensible_named_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.string_extensible_named.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_string_extensible_named_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.string_extensible_named.send( - body={"prop": "str"}, - prop="str", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_named_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_named_operations_async.py deleted file mode 100644 index 63d9457c2a8..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_named_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringExtensibleNamedOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_string_extensible_named_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.string_extensible_named.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_string_extensible_named_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.string_extensible_named.send( - body={"prop": "str"}, - prop="str", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_operations.py deleted file mode 100644 index 4514fdc2676..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringExtensibleOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_string_extensible_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.string_extensible.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_string_extensible_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.string_extensible.send( - body={"prop": "b"}, - prop="b", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_operations_async.py deleted file mode 100644 index 7150caa0edd..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_string_extensible_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringExtensibleOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_string_extensible_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.string_extensible.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_string_extensible_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.string_extensible.send( - body={"prop": "b"}, - prop="b", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_strings_only_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_strings_only_operations.py deleted file mode 100644 index 2181e8a0ced..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_strings_only_operations.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils import recorded_by_proxy -from testpreparer import UnionClientTestBase, UnionPreparer - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringsOnlyOperations(UnionClientTestBase): - @UnionPreparer() - @recorded_by_proxy - def test_strings_only_get(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.strings_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy - def test_strings_only_send(self, union_endpoint): - client = self.create_client(endpoint=union_endpoint) - response = client.strings_only.send( - body={"prop": "a"}, - prop="a", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_strings_only_operations_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_strings_only_operations_async.py deleted file mode 100644 index 89d23916804..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/test_union_strings_only_operations_async.py +++ /dev/null @@ -1,35 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -import pytest -from devtools_testutils.aio import recorded_by_proxy_async -from testpreparer import UnionPreparer -from testpreparer_async import UnionClientTestBaseAsync - - -@pytest.mark.skip("you may need to update the auto-generated test case before run it") -class TestUnionStringsOnlyOperationsAsync(UnionClientTestBaseAsync): - @UnionPreparer() - @recorded_by_proxy_async - async def test_strings_only_get(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.strings_only.get() - - # please add some check logic here by yourself - # ... - - @UnionPreparer() - @recorded_by_proxy_async - async def test_strings_only_send(self, union_endpoint): - client = self.create_async_client(endpoint=union_endpoint) - response = await client.strings_only.send( - body={"prop": "a"}, - prop="a", - ) - - # please add some check logic here by yourself - # ... diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/testpreparer.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/testpreparer.py deleted file mode 100644 index 0d66b2cf3fa..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/testpreparer.py +++ /dev/null @@ -1,24 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from devtools_testutils import AzureRecordedTestCase, PowerShellPreparer -import functools -from typetest.union import UnionClient - - -class UnionClientTestBase(AzureRecordedTestCase): - - def create_client(self, endpoint): - credential = self.get_credential(UnionClient) - return self.create_client_from_credential( - UnionClient, - credential=credential, - endpoint=endpoint, - ) - - -UnionPreparer = functools.partial(PowerShellPreparer, "union", union_endpoint="https://fake_union_endpoint.com") diff --git a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/testpreparer_async.py b/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/testpreparer_async.py deleted file mode 100644 index d61fa77c079..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/generated_tests/testpreparer_async.py +++ /dev/null @@ -1,20 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from devtools_testutils import AzureRecordedTestCase -from typetest.union.aio import UnionClient - - -class UnionClientTestBaseAsync(AzureRecordedTestCase): - - def create_async_client(self, endpoint): - credential = self.get_credential(UnionClient, is_async=True) - return self.create_client_from_credential( - UnionClient, - credential=credential, - endpoint=endpoint, - ) diff --git a/packages/typespec-python/test/azure/generated/typetest-union/pyproject.toml b/packages/typespec-python/test/azure/generated/typetest-union/pyproject.toml deleted file mode 100644 index 6591dfce217..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/pyproject.toml +++ /dev/null @@ -1,58 +0,0 @@ -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -[build-system] -requires = ["setuptools>=61.0.0", "wheel"] # Requires 61.0.0 for dynamic version -build-backend = "setuptools.build_meta" - -[project] -name = "typetest-union" -authors = [ - { name = "Microsoft Corporation", email = "azpysdkhelp@microsoft.com" }, -] -description = "Microsoft Corporation Azure Typetest Union Client Library for Python" -license = {text = "MIT License"} -classifiers = [ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "License :: OSI Approved :: MIT License", -] -requires-python = ">=3.9" -keywords = ["azure", "azure sdk"] - -dependencies = [ - "isodate>=0.6.1", - "azure-core>=1.35.0", - "typing-extensions>=4.6.0", -] -dynamic = [ -"version", "readme" -] - -[project.urls] -repository = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" - -[tool.setuptools.dynamic] -version = {attr = "typetest.union._version.VERSION"} -readme = {file = ["README.md"], content-type = "text/markdown"} - -[tool.setuptools.packages.find] -exclude = [ - "tests*", - "samples*", - "typetest", -] - -[tool.setuptools.package-data] -pytyped = ["py.typed"] diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/__init__.py deleted file mode 100644 index d55ccad1f57..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/__init__.py deleted file mode 100644 index acbdf9852b1..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/__init__.py +++ /dev/null @@ -1,32 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._client import UnionClient # type: ignore -from ._version import VERSION - -__version__ = VERSION - -try: - from ._patch import __all__ as _patch_all - from ._patch import * -except ImportError: - _patch_all = [] -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "UnionClient", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore - -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_client.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_client.py deleted file mode 100644 index 8863b50c815..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_client.py +++ /dev/null @@ -1,137 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from copy import deepcopy -from typing import Any -from typing_extensions import Self - -from azure.core import PipelineClient -from azure.core.pipeline import policies -from azure.core.rest import HttpRequest, HttpResponse - -from ._configuration import UnionClientConfiguration -from ._utils.serialization import Deserializer, Serializer -from .operations import ( - EnumsOnlyOperations, - FloatsOnlyOperations, - IntsOnlyOperations, - MixedLiteralsOperations, - MixedTypesOperations, - ModelsOnlyOperations, - StringAndArrayOperations, - StringExtensibleNamedOperations, - StringExtensibleOperations, - StringsOnlyOperations, -) - - -class UnionClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes - """Describe scenarios for various combinations of unions. - - :ivar strings_only: StringsOnlyOperations operations - :vartype strings_only: typetest.union.operations.StringsOnlyOperations - :ivar string_extensible: StringExtensibleOperations operations - :vartype string_extensible: typetest.union.operations.StringExtensibleOperations - :ivar string_extensible_named: StringExtensibleNamedOperations operations - :vartype string_extensible_named: typetest.union.operations.StringExtensibleNamedOperations - :ivar ints_only: IntsOnlyOperations operations - :vartype ints_only: typetest.union.operations.IntsOnlyOperations - :ivar floats_only: FloatsOnlyOperations operations - :vartype floats_only: typetest.union.operations.FloatsOnlyOperations - :ivar models_only: ModelsOnlyOperations operations - :vartype models_only: typetest.union.operations.ModelsOnlyOperations - :ivar enums_only: EnumsOnlyOperations operations - :vartype enums_only: typetest.union.operations.EnumsOnlyOperations - :ivar string_and_array: StringAndArrayOperations operations - :vartype string_and_array: typetest.union.operations.StringAndArrayOperations - :ivar mixed_literals: MixedLiteralsOperations operations - :vartype mixed_literals: typetest.union.operations.MixedLiteralsOperations - :ivar mixed_types: MixedTypesOperations operations - :vartype mixed_types: typetest.union.operations.MixedTypesOperations - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - """ - - def __init__( # pylint: disable=missing-client-constructor-parameter-credential - self, *, endpoint: str = "http://localhost:3000", **kwargs: Any - ) -> None: - _endpoint = "{endpoint}" - self._config = UnionClientConfiguration(endpoint=endpoint, **kwargs) - - _policies = kwargs.pop("policies", None) - if _policies is None: - _policies = [ - policies.RequestIdPolicy(**kwargs), - self._config.headers_policy, - self._config.user_agent_policy, - self._config.proxy_policy, - policies.ContentDecodePolicy(**kwargs), - self._config.redirect_policy, - self._config.retry_policy, - self._config.authentication_policy, - self._config.custom_hook_policy, - self._config.logging_policy, - policies.DistributedTracingPolicy(**kwargs), - policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, - self._config.http_logging_policy, - ] - self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - - self._serialize = Serializer() - self._deserialize = Deserializer() - self._serialize.client_side_validation = False - self.strings_only = StringsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.string_extensible = StringExtensibleOperations( - self._client, self._config, self._serialize, self._deserialize - ) - self.string_extensible_named = StringExtensibleNamedOperations( - self._client, self._config, self._serialize, self._deserialize - ) - self.ints_only = IntsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.floats_only = FloatsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.models_only = ModelsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.enums_only = EnumsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.string_and_array = StringAndArrayOperations(self._client, self._config, self._serialize, self._deserialize) - self.mixed_literals = MixedLiteralsOperations(self._client, self._config, self._serialize, self._deserialize) - self.mixed_types = MixedTypesOperations(self._client, self._config, self._serialize, self._deserialize) - - def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse: - """Runs the network request through the client's chained policies. - - >>> from azure.core.rest import HttpRequest - >>> request = HttpRequest("GET", "https://www.example.org/") - - >>> response = client.send_request(request) - - - For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request - - :param request: The network request you want to make. Required. - :type request: ~azure.core.rest.HttpRequest - :keyword bool stream: Whether the response payload will be streamed. Defaults to False. - :return: The response of your network call. Does not do error handling on your response. - :rtype: ~azure.core.rest.HttpResponse - """ - - request_copy = deepcopy(request) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - - request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) - return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore - - def close(self) -> None: - self._client.close() - - def __enter__(self) -> Self: - self._client.__enter__() - return self - - def __exit__(self, *exc_details: Any) -> None: - self._client.__exit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_configuration.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_configuration.py deleted file mode 100644 index 33107b509a7..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_configuration.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from typing import Any - -from azure.core.pipeline import policies - -from ._version import VERSION - - -class UnionClientConfiguration: # pylint: disable=too-many-instance-attributes - """Configuration for UnionClient. - - Note that all parameters used to create this instance are saved as instance - attributes. - - :param endpoint: Service host. Default value is "http://localhost:3000". - :type endpoint: str - """ - - def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - - self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "typetest-union/{}".format(VERSION)) - self.polling_interval = kwargs.get("polling_interval", 30) - self._configure(**kwargs) - - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs) - self.authentication_policy = kwargs.get("authentication_policy") diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_patch.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/__init__.py deleted file mode 100644 index 8026245c2ab..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/model_base.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/model_base.py deleted file mode 100644 index 49d5c725938..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/model_base.py +++ /dev/null @@ -1,1232 +0,0 @@ -# pylint: disable=too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=protected-access, broad-except - -import copy -import calendar -import decimal -import functools -import sys -import logging -import base64 -import re -import typing -import enum -import email.utils -from datetime import datetime, date, time, timedelta, timezone -from json import JSONEncoder -import xml.etree.ElementTree as ET -from collections.abc import MutableMapping -from typing_extensions import Self -import isodate -from azure.core.exceptions import DeserializationError -from azure.core import CaseInsensitiveEnumMeta -from azure.core.pipeline import PipelineResponse -from azure.core.serialization import _Null - -_LOGGER = logging.getLogger(__name__) - -__all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"] - -TZ_UTC = timezone.utc -_T = typing.TypeVar("_T") - - -def _timedelta_as_isostr(td: timedelta) -> str: - """Converts a datetime.timedelta object into an ISO 8601 formatted string, e.g. 'P4DT12H30M05S' - - Function adapted from the Tin Can Python project: https://github.com/RusticiSoftware/TinCanPython - - :param timedelta td: The timedelta to convert - :rtype: str - :return: ISO8601 version of this timedelta - """ - - # Split seconds to larger units - seconds = td.total_seconds() - minutes, seconds = divmod(seconds, 60) - hours, minutes = divmod(minutes, 60) - days, hours = divmod(hours, 24) - - days, hours, minutes = list(map(int, (days, hours, minutes))) - seconds = round(seconds, 6) - - # Build date - date_str = "" - if days: - date_str = "%sD" % days - - if hours or minutes or seconds: - # Build time - time_str = "T" - - # Hours - bigger_exists = date_str or hours - if bigger_exists: - time_str += "{:02}H".format(hours) - - # Minutes - bigger_exists = bigger_exists or minutes - if bigger_exists: - time_str += "{:02}M".format(minutes) - - # Seconds - try: - if seconds.is_integer(): - seconds_string = "{:02}".format(int(seconds)) - else: - # 9 chars long w/ leading 0, 6 digits after decimal - seconds_string = "%09.6f" % seconds - # Remove trailing zeros - seconds_string = seconds_string.rstrip("0") - except AttributeError: # int.is_integer() raises - seconds_string = "{:02}".format(seconds) - - time_str += "{}S".format(seconds_string) - else: - time_str = "" - - return "P" + date_str + time_str - - -def _serialize_bytes(o, format: typing.Optional[str] = None) -> str: - encoded = base64.b64encode(o).decode() - if format == "base64url": - return encoded.strip("=").replace("+", "-").replace("/", "_") - return encoded - - -def _serialize_datetime(o, format: typing.Optional[str] = None): - if hasattr(o, "year") and hasattr(o, "hour"): - if format == "rfc7231": - return email.utils.format_datetime(o, usegmt=True) - if format == "unix-timestamp": - return int(calendar.timegm(o.utctimetuple())) - - # astimezone() fails for naive times in Python 2.7, so make make sure o is aware (tzinfo is set) - if not o.tzinfo: - iso_formatted = o.replace(tzinfo=TZ_UTC).isoformat() - else: - iso_formatted = o.astimezone(TZ_UTC).isoformat() - # Replace the trailing "+00:00" UTC offset with "Z" (RFC 3339: https://www.ietf.org/rfc/rfc3339.txt) - return iso_formatted.replace("+00:00", "Z") - # Next try datetime.date or datetime.time - return o.isoformat() - - -def _is_readonly(p): - try: - return p._visibility == ["read"] - except AttributeError: - return False - - -class SdkJSONEncoder(JSONEncoder): - """A JSON encoder that's capable of serializing datetime objects and bytes.""" - - def __init__(self, *args, exclude_readonly: bool = False, format: typing.Optional[str] = None, **kwargs): - super().__init__(*args, **kwargs) - self.exclude_readonly = exclude_readonly - self.format = format - - def default(self, o): # pylint: disable=too-many-return-statements - if _is_model(o): - if self.exclude_readonly: - readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] - return {k: v for k, v in o.items() if k not in readonly_props} - return dict(o.items()) - try: - return super(SdkJSONEncoder, self).default(o) - except TypeError: - if isinstance(o, _Null): - return None - if isinstance(o, decimal.Decimal): - return float(o) - if isinstance(o, (bytes, bytearray)): - return _serialize_bytes(o, self.format) - try: - # First try datetime.datetime - return _serialize_datetime(o, self.format) - except AttributeError: - pass - # Last, try datetime.timedelta - try: - return _timedelta_as_isostr(o) - except AttributeError: - # This will be raised when it hits value.total_seconds in the method above - pass - return super(SdkJSONEncoder, self).default(o) - - -_VALID_DATE = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" + r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") -_VALID_RFC7231 = re.compile( - r"(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s\d{2}\s" - r"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\s\d{2}:\d{2}:\d{2}\sGMT" -) - - -def _deserialize_datetime(attr: typing.Union[str, datetime]) -> datetime: - """Deserialize ISO-8601 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - attr = attr.upper() - match = _VALID_DATE.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - check_decimal = attr.split(".") - if len(check_decimal) > 1: - decimal_str = "" - for digit in check_decimal[1]: - if digit.isdigit(): - decimal_str += digit - else: - break - if len(decimal_str) > 6: - attr = attr.replace(decimal_str, decimal_str[0:6]) - - date_obj = isodate.parse_datetime(attr) - test_utc = date_obj.utctimetuple() - if test_utc.tm_year > 9999 or test_utc.tm_year < 1: - raise OverflowError("Hit max or min date") - return date_obj - - -def _deserialize_datetime_rfc7231(attr: typing.Union[str, datetime]) -> datetime: - """Deserialize RFC7231 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - match = _VALID_RFC7231.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - return email.utils.parsedate_to_datetime(attr) - - -def _deserialize_datetime_unix_timestamp(attr: typing.Union[float, datetime]) -> datetime: - """Deserialize unix timestamp into Datetime object. - - :param str attr: response string to be deserialized. - :rtype: ~datetime.datetime - :returns: The datetime object from that input - """ - if isinstance(attr, datetime): - # i'm already deserialized - return attr - return datetime.fromtimestamp(attr, TZ_UTC) - - -def _deserialize_date(attr: typing.Union[str, date]) -> date: - """Deserialize ISO-8601 formatted string into Date object. - :param str attr: response string to be deserialized. - :rtype: date - :returns: The date object from that input - """ - # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - if isinstance(attr, date): - return attr - return isodate.parse_date(attr, defaultmonth=None, defaultday=None) # type: ignore - - -def _deserialize_time(attr: typing.Union[str, time]) -> time: - """Deserialize ISO-8601 formatted string into time object. - - :param str attr: response string to be deserialized. - :rtype: datetime.time - :returns: The time object from that input - """ - if isinstance(attr, time): - return attr - return isodate.parse_time(attr) - - -def _deserialize_bytes(attr): - if isinstance(attr, (bytes, bytearray)): - return attr - return bytes(base64.b64decode(attr)) - - -def _deserialize_bytes_base64(attr): - if isinstance(attr, (bytes, bytearray)): - return attr - padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore - attr = attr + padding # type: ignore - encoded = attr.replace("-", "+").replace("_", "/") - return bytes(base64.b64decode(encoded)) - - -def _deserialize_duration(attr): - if isinstance(attr, timedelta): - return attr - return isodate.parse_duration(attr) - - -def _deserialize_decimal(attr): - if isinstance(attr, decimal.Decimal): - return attr - return decimal.Decimal(str(attr)) - - -def _deserialize_int_as_str(attr): - if isinstance(attr, int): - return attr - return int(attr) - - -_DESERIALIZE_MAPPING = { - datetime: _deserialize_datetime, - date: _deserialize_date, - time: _deserialize_time, - bytes: _deserialize_bytes, - bytearray: _deserialize_bytes, - timedelta: _deserialize_duration, - typing.Any: lambda x: x, - decimal.Decimal: _deserialize_decimal, -} - -_DESERIALIZE_MAPPING_WITHFORMAT = { - "rfc3339": _deserialize_datetime, - "rfc7231": _deserialize_datetime_rfc7231, - "unix-timestamp": _deserialize_datetime_unix_timestamp, - "base64": _deserialize_bytes, - "base64url": _deserialize_bytes_base64, -} - - -def get_deserializer(annotation: typing.Any, rf: typing.Optional["_RestField"] = None): - if annotation is int and rf and rf._format == "str": - return _deserialize_int_as_str - if rf and rf._format: - return _DESERIALIZE_MAPPING_WITHFORMAT.get(rf._format) - return _DESERIALIZE_MAPPING.get(annotation) # pyright: ignore - - -def _get_type_alias_type(module_name: str, alias_name: str): - types = { - k: v - for k, v in sys.modules[module_name].__dict__.items() - if isinstance(v, typing._GenericAlias) # type: ignore - } - if alias_name not in types: - return alias_name - return types[alias_name] - - -def _get_model(module_name: str, model_name: str): - models = {k: v for k, v in sys.modules[module_name].__dict__.items() if isinstance(v, type)} - module_end = module_name.rsplit(".", 1)[0] - models.update({k: v for k, v in sys.modules[module_end].__dict__.items() if isinstance(v, type)}) - if isinstance(model_name, str): - model_name = model_name.split(".")[-1] - if model_name not in models: - return model_name - return models[model_name] - - -_UNSET = object() - - -class _MyMutableMapping(MutableMapping[str, typing.Any]): - def __init__(self, data: typing.Dict[str, typing.Any]) -> None: - self._data = data - - def __contains__(self, key: typing.Any) -> bool: - return key in self._data - - def __getitem__(self, key: str) -> typing.Any: - return self._data.__getitem__(key) - - def __setitem__(self, key: str, value: typing.Any) -> None: - self._data.__setitem__(key, value) - - def __delitem__(self, key: str) -> None: - self._data.__delitem__(key) - - def __iter__(self) -> typing.Iterator[typing.Any]: - return self._data.__iter__() - - def __len__(self) -> int: - return self._data.__len__() - - def __ne__(self, other: typing.Any) -> bool: - return not self.__eq__(other) - - def keys(self) -> typing.KeysView[str]: - """ - :returns: a set-like object providing a view on D's keys - :rtype: ~typing.KeysView - """ - return self._data.keys() - - def values(self) -> typing.ValuesView[typing.Any]: - """ - :returns: an object providing a view on D's values - :rtype: ~typing.ValuesView - """ - return self._data.values() - - def items(self) -> typing.ItemsView[str, typing.Any]: - """ - :returns: set-like object providing a view on D's items - :rtype: ~typing.ItemsView - """ - return self._data.items() - - def get(self, key: str, default: typing.Any = None) -> typing.Any: - """ - Get the value for key if key is in the dictionary, else default. - :param str key: The key to look up. - :param any default: The value to return if key is not in the dictionary. Defaults to None - :returns: D[k] if k in D, else d. - :rtype: any - """ - try: - return self[key] - except KeyError: - return default - - @typing.overload - def pop(self, key: str) -> typing.Any: ... # pylint: disable=arguments-differ - - @typing.overload - def pop(self, key: str, default: _T) -> _T: ... # pylint: disable=signature-differs - - @typing.overload - def pop(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs - - def pop(self, key: str, default: typing.Any = _UNSET) -> typing.Any: - """ - Removes specified key and return the corresponding value. - :param str key: The key to pop. - :param any default: The value to return if key is not in the dictionary - :returns: The value corresponding to the key. - :rtype: any - :raises KeyError: If key is not found and default is not given. - """ - if default is _UNSET: - return self._data.pop(key) - return self._data.pop(key, default) - - def popitem(self) -> typing.Tuple[str, typing.Any]: - """ - Removes and returns some (key, value) pair - :returns: The (key, value) pair. - :rtype: tuple - :raises KeyError: if D is empty. - """ - return self._data.popitem() - - def clear(self) -> None: - """ - Remove all items from D. - """ - self._data.clear() - - def update(self, *args: typing.Any, **kwargs: typing.Any) -> None: # pylint: disable=arguments-differ - """ - Updates D from mapping/iterable E and F. - :param any args: Either a mapping object or an iterable of key-value pairs. - """ - self._data.update(*args, **kwargs) - - @typing.overload - def setdefault(self, key: str, default: None = None) -> None: ... - - @typing.overload - def setdefault(self, key: str, default: typing.Any) -> typing.Any: ... # pylint: disable=signature-differs - - def setdefault(self, key: str, default: typing.Any = _UNSET) -> typing.Any: - """ - Same as calling D.get(k, d), and setting D[k]=d if k not found - :param str key: The key to look up. - :param any default: The value to set if key is not in the dictionary - :returns: D[k] if k in D, else d. - :rtype: any - """ - if default is _UNSET: - return self._data.setdefault(key) - return self._data.setdefault(key, default) - - def __eq__(self, other: typing.Any) -> bool: - try: - other_model = self.__class__(other) - except Exception: - return False - return self._data == other_model._data - - def __repr__(self) -> str: - return str(self._data) - - -def _is_model(obj: typing.Any) -> bool: - return getattr(obj, "_is_model", False) - - -def _serialize(o, format: typing.Optional[str] = None): # pylint: disable=too-many-return-statements - if isinstance(o, list): - return [_serialize(x, format) for x in o] - if isinstance(o, dict): - return {k: _serialize(v, format) for k, v in o.items()} - if isinstance(o, set): - return {_serialize(x, format) for x in o} - if isinstance(o, tuple): - return tuple(_serialize(x, format) for x in o) - if isinstance(o, (bytes, bytearray)): - return _serialize_bytes(o, format) - if isinstance(o, decimal.Decimal): - return float(o) - if isinstance(o, enum.Enum): - return o.value - if isinstance(o, int): - if format == "str": - return str(o) - return o - try: - # First try datetime.datetime - return _serialize_datetime(o, format) - except AttributeError: - pass - # Last, try datetime.timedelta - try: - return _timedelta_as_isostr(o) - except AttributeError: - # This will be raised when it hits value.total_seconds in the method above - pass - return o - - -def _get_rest_field( - attr_to_rest_field: typing.Dict[str, "_RestField"], rest_name: str -) -> typing.Optional["_RestField"]: - try: - return next(rf for rf in attr_to_rest_field.values() if rf._rest_name == rest_name) - except StopIteration: - return None - - -def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any: - if not rf: - return _serialize(value, None) - if rf._is_multipart_file_input: - return value - if rf._is_model: - return _deserialize(rf._type, value) - if isinstance(value, ET.Element): - value = _deserialize(rf._type, value) - return _serialize(value, rf._format) - - -class Model(_MyMutableMapping): - _is_model = True - # label whether current class's _attr_to_rest_field has been calculated - # could not see _attr_to_rest_field directly because subclass inherits it from parent class - _calculated: typing.Set[str] = set() - - def __init__(self, *args: typing.Any, **kwargs: typing.Any) -> None: - class_name = self.__class__.__name__ - if len(args) > 1: - raise TypeError(f"{class_name}.__init__() takes 2 positional arguments but {len(args) + 1} were given") - dict_to_pass = { - rest_field._rest_name: rest_field._default - for rest_field in self._attr_to_rest_field.values() - if rest_field._default is not _UNSET - } - if args: # pylint: disable=too-many-nested-blocks - if isinstance(args[0], ET.Element): - existed_attr_keys = [] - model_meta = getattr(self, "_xml", {}) - - for rf in self._attr_to_rest_field.values(): - prop_meta = getattr(rf, "_xml", {}) - xml_name = prop_meta.get("name", rf._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - # attribute - if prop_meta.get("attribute", False) and args[0].get(xml_name) is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].get(xml_name)) - continue - - # unwrapped element is array - if prop_meta.get("unwrapped", False): - # unwrapped array could either use prop items meta/prop meta - if prop_meta.get("itemsName"): - xml_name = prop_meta.get("itemsName") - xml_ns = prop_meta.get("itemNs") - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - items = args[0].findall(xml_name) # pyright: ignore - if len(items) > 0: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, items) - continue - - # text element is primitive type - if prop_meta.get("text", False): - if args[0].text is not None: - dict_to_pass[rf._rest_name] = _deserialize(rf._type, args[0].text) - continue - - # wrapped element could be normal property or array, it should only have one element - item = args[0].find(xml_name) - if item is not None: - existed_attr_keys.append(xml_name) - dict_to_pass[rf._rest_name] = _deserialize(rf._type, item) - - # rest thing is additional properties - for e in args[0]: - if e.tag not in existed_attr_keys: - dict_to_pass[e.tag] = _convert_element(e) - else: - dict_to_pass.update( - {k: _create_value(_get_rest_field(self._attr_to_rest_field, k), v) for k, v in args[0].items()} - ) - else: - non_attr_kwargs = [k for k in kwargs if k not in self._attr_to_rest_field] - if non_attr_kwargs: - # actual type errors only throw the first wrong keyword arg they see, so following that. - raise TypeError(f"{class_name}.__init__() got an unexpected keyword argument '{non_attr_kwargs[0]}'") - dict_to_pass.update( - { - self._attr_to_rest_field[k]._rest_name: _create_value(self._attr_to_rest_field[k], v) - for k, v in kwargs.items() - if v is not None - } - ) - super().__init__(dict_to_pass) - - def copy(self) -> "Model": - return Model(self.__dict__) - - def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self: - if f"{cls.__module__}.{cls.__qualname__}" not in cls._calculated: - # we know the last nine classes in mro are going to be 'Model', '_MyMutableMapping', 'MutableMapping', - # 'Mapping', 'Collection', 'Sized', 'Iterable', 'Container' and 'object' - mros = cls.__mro__[:-9][::-1] # ignore parents, and reverse the mro order - attr_to_rest_field: typing.Dict[str, _RestField] = { # map attribute name to rest_field property - k: v for mro_class in mros for k, v in mro_class.__dict__.items() if k[0] != "_" and hasattr(v, "_type") - } - annotations = { - k: v - for mro_class in mros - if hasattr(mro_class, "__annotations__") - for k, v in mro_class.__annotations__.items() - } - for attr, rf in attr_to_rest_field.items(): - rf._module = cls.__module__ - if not rf._type: - rf._type = rf._get_deserialize_callable_from_annotation(annotations.get(attr, None)) - if not rf._rest_name_input: - rf._rest_name_input = attr - cls._attr_to_rest_field: typing.Dict[str, _RestField] = dict(attr_to_rest_field.items()) - cls._calculated.add(f"{cls.__module__}.{cls.__qualname__}") - - return super().__new__(cls) - - def __init_subclass__(cls, discriminator: typing.Optional[str] = None) -> None: - for base in cls.__bases__: - if hasattr(base, "__mapping__"): - base.__mapping__[discriminator or cls.__name__] = cls # type: ignore - - @classmethod - def _get_discriminator(cls, exist_discriminators) -> typing.Optional["_RestField"]: - for v in cls.__dict__.values(): - if isinstance(v, _RestField) and v._is_discriminator and v._rest_name not in exist_discriminators: - return v - return None - - @classmethod - def _deserialize(cls, data, exist_discriminators): - if not hasattr(cls, "__mapping__"): - return cls(data) - discriminator = cls._get_discriminator(exist_discriminators) - if discriminator is None: - return cls(data) - exist_discriminators.append(discriminator._rest_name) - if isinstance(data, ET.Element): - model_meta = getattr(cls, "_xml", {}) - prop_meta = getattr(discriminator, "_xml", {}) - xml_name = prop_meta.get("name", discriminator._rest_name) - xml_ns = prop_meta.get("ns", model_meta.get("ns", None)) - if xml_ns: - xml_name = "{" + xml_ns + "}" + xml_name - - if data.get(xml_name) is not None: - discriminator_value = data.get(xml_name) - else: - discriminator_value = data.find(xml_name).text # pyright: ignore - else: - discriminator_value = data.get(discriminator._rest_name) - mapped_cls = cls.__mapping__.get(discriminator_value, cls) # pyright: ignore # pylint: disable=no-member - return mapped_cls._deserialize(data, exist_discriminators) - - def as_dict(self, *, exclude_readonly: bool = False) -> typing.Dict[str, typing.Any]: - """Return a dict that can be turned into json using json.dump. - - :keyword bool exclude_readonly: Whether to remove the readonly properties. - :returns: A dict JSON compatible object - :rtype: dict - """ - - result = {} - readonly_props = [] - if exclude_readonly: - readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)] - for k, v in self.items(): - if exclude_readonly and k in readonly_props: # pyright: ignore - continue - is_multipart_file_input = False - try: - is_multipart_file_input = next( - rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k - )._is_multipart_file_input - except StopIteration: - pass - result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly) - return result - - @staticmethod - def _as_dict_value(v: typing.Any, exclude_readonly: bool = False) -> typing.Any: - if v is None or isinstance(v, _Null): - return None - if isinstance(v, (list, tuple, set)): - return type(v)(Model._as_dict_value(x, exclude_readonly=exclude_readonly) for x in v) - if isinstance(v, dict): - return {dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly) for dk, dv in v.items()} - return v.as_dict(exclude_readonly=exclude_readonly) if hasattr(v, "as_dict") else v - - -def _deserialize_model(model_deserializer: typing.Optional[typing.Callable], obj): - if _is_model(obj): - return obj - return _deserialize(model_deserializer, obj) - - -def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj): - if obj is None: - return obj - return _deserialize_with_callable(if_obj_deserializer, obj) - - -def _deserialize_with_union(deserializers, obj): - for deserializer in deserializers: - try: - return _deserialize(deserializer, obj) - except DeserializationError: - pass - raise DeserializationError() - - -def _deserialize_dict( - value_deserializer: typing.Optional[typing.Callable], - module: typing.Optional[str], - obj: typing.Dict[typing.Any, typing.Any], -): - if obj is None: - return obj - if isinstance(obj, ET.Element): - obj = {child.tag: child for child in obj} - return {k: _deserialize(value_deserializer, v, module) for k, v in obj.items()} - - -def _deserialize_multiple_sequence( - entry_deserializers: typing.List[typing.Optional[typing.Callable]], - module: typing.Optional[str], - obj, -): - if obj is None: - return obj - return type(obj)(_deserialize(deserializer, entry, module) for entry, deserializer in zip(obj, entry_deserializers)) - - -def _deserialize_sequence( - deserializer: typing.Optional[typing.Callable], - module: typing.Optional[str], - obj, -): - if obj is None: - return obj - if isinstance(obj, ET.Element): - obj = list(obj) - return type(obj)(_deserialize(deserializer, entry, module) for entry in obj) - - -def _sorted_annotations(types: typing.List[typing.Any]) -> typing.List[typing.Any]: - return sorted( - types, - key=lambda x: hasattr(x, "__name__") and x.__name__.lower() in ("str", "float", "int", "bool"), - ) - - -def _get_deserialize_callable_from_annotation( # pylint: disable=too-many-return-statements, too-many-branches - annotation: typing.Any, - module: typing.Optional[str], - rf: typing.Optional["_RestField"] = None, -) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: - if not annotation: - return None - - # is it a type alias? - if isinstance(annotation, str): - if module is not None: - annotation = _get_type_alias_type(module, annotation) - - # is it a forward ref / in quotes? - if isinstance(annotation, (str, typing.ForwardRef)): - try: - model_name = annotation.__forward_arg__ # type: ignore - except AttributeError: - model_name = annotation - if module is not None: - annotation = _get_model(module, model_name) # type: ignore - - try: - if module and _is_model(annotation): - if rf: - rf._is_model = True - - return functools.partial(_deserialize_model, annotation) # pyright: ignore - except Exception: - pass - - # is it a literal? - try: - if annotation.__origin__ is typing.Literal: # pyright: ignore - return None - except AttributeError: - pass - - # is it optional? - try: - if any(a for a in annotation.__args__ if a == type(None)): # pyright: ignore - if len(annotation.__args__) <= 2: # pyright: ignore - if_obj_deserializer = _get_deserialize_callable_from_annotation( - next(a for a in annotation.__args__ if a != type(None)), module, rf # pyright: ignore - ) - - return functools.partial(_deserialize_with_optional, if_obj_deserializer) - # the type is Optional[Union[...]], we need to remove the None type from the Union - annotation_copy = copy.copy(annotation) - annotation_copy.__args__ = [a for a in annotation_copy.__args__ if a != type(None)] # pyright: ignore - return _get_deserialize_callable_from_annotation(annotation_copy, module, rf) - except AttributeError: - pass - - # is it union? - if getattr(annotation, "__origin__", None) is typing.Union: - # initial ordering is we make `string` the last deserialization option, because it is often them most generic - deserializers = [ - _get_deserialize_callable_from_annotation(arg, module, rf) - for arg in _sorted_annotations(annotation.__args__) # pyright: ignore - ] - - return functools.partial(_deserialize_with_union, deserializers) - - try: - if annotation._name == "Dict": # pyright: ignore - value_deserializer = _get_deserialize_callable_from_annotation( - annotation.__args__[1], module, rf # pyright: ignore - ) - - return functools.partial( - _deserialize_dict, - value_deserializer, - module, - ) - except (AttributeError, IndexError): - pass - try: - if annotation._name in ["List", "Set", "Tuple", "Sequence"]: # pyright: ignore - if len(annotation.__args__) > 1: # pyright: ignore - entry_deserializers = [ - _get_deserialize_callable_from_annotation(dt, module, rf) - for dt in annotation.__args__ # pyright: ignore - ] - return functools.partial(_deserialize_multiple_sequence, entry_deserializers, module) - deserializer = _get_deserialize_callable_from_annotation( - annotation.__args__[0], module, rf # pyright: ignore - ) - - return functools.partial(_deserialize_sequence, deserializer, module) - except (TypeError, IndexError, AttributeError, SyntaxError): - pass - - def _deserialize_default( - deserializer, - obj, - ): - if obj is None: - return obj - try: - return _deserialize_with_callable(deserializer, obj) - except Exception: - pass - return obj - - if get_deserializer(annotation, rf): - return functools.partial(_deserialize_default, get_deserializer(annotation, rf)) - - return functools.partial(_deserialize_default, annotation) - - -def _deserialize_with_callable( - deserializer: typing.Optional[typing.Callable[[typing.Any], typing.Any]], - value: typing.Any, -): # pylint: disable=too-many-return-statements - try: - if value is None or isinstance(value, _Null): - return None - if isinstance(value, ET.Element): - if deserializer is str: - return value.text or "" - if deserializer is int: - return int(value.text) if value.text else None - if deserializer is float: - return float(value.text) if value.text else None - if deserializer is bool: - return value.text == "true" if value.text else None - if deserializer is None: - return value - if deserializer in [int, float, bool]: - return deserializer(value) - if isinstance(deserializer, CaseInsensitiveEnumMeta): - try: - return deserializer(value) - except ValueError: - # for unknown value, return raw value - return value - if isinstance(deserializer, type) and issubclass(deserializer, Model): - return deserializer._deserialize(value, []) - return typing.cast(typing.Callable[[typing.Any], typing.Any], deserializer)(value) - except Exception as e: - raise DeserializationError() from e - - -def _deserialize( - deserializer: typing.Any, - value: typing.Any, - module: typing.Optional[str] = None, - rf: typing.Optional["_RestField"] = None, - format: typing.Optional[str] = None, -) -> typing.Any: - if isinstance(value, PipelineResponse): - value = value.http_response.json() - if rf is None and format: - rf = _RestField(format=format) - if not isinstance(deserializer, functools.partial): - deserializer = _get_deserialize_callable_from_annotation(deserializer, module, rf) - return _deserialize_with_callable(deserializer, value) - - -def _failsafe_deserialize( - deserializer: typing.Any, - value: typing.Any, - module: typing.Optional[str] = None, - rf: typing.Optional["_RestField"] = None, - format: typing.Optional[str] = None, -) -> typing.Any: - try: - return _deserialize(deserializer, value, module, rf, format) - except DeserializationError: - _LOGGER.warning( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - -def _failsafe_deserialize_xml( - deserializer: typing.Any, - value: typing.Any, -) -> typing.Any: - try: - return _deserialize_xml(deserializer, value) - except DeserializationError: - _LOGGER.warning( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - -class _RestField: - def __init__( - self, - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - is_discriminator: bool = False, - visibility: typing.Optional[typing.List[str]] = None, - default: typing.Any = _UNSET, - format: typing.Optional[str] = None, - is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, - ): - self._type = type - self._rest_name_input = name - self._module: typing.Optional[str] = None - self._is_discriminator = is_discriminator - self._visibility = visibility - self._is_model = False - self._default = default - self._format = format - self._is_multipart_file_input = is_multipart_file_input - self._xml = xml if xml is not None else {} - - @property - def _class_type(self) -> typing.Any: - return getattr(self._type, "args", [None])[0] - - @property - def _rest_name(self) -> str: - if self._rest_name_input is None: - raise ValueError("Rest name was never set") - return self._rest_name_input - - def __get__(self, obj: Model, type=None): # pylint: disable=redefined-builtin - # by this point, type and rest_name will have a value bc we default - # them in __new__ of the Model class - item = obj.get(self._rest_name) - if item is None: - return item - if self._is_model: - return item - return _deserialize(self._type, _serialize(item, self._format), rf=self) - - def __set__(self, obj: Model, value) -> None: - if value is None: - # we want to wipe out entries if users set attr to None - try: - obj.__delitem__(self._rest_name) - except KeyError: - pass - return - if self._is_model: - if not _is_model(value): - value = _deserialize(self._type, value) - obj.__setitem__(self._rest_name, value) - return - obj.__setitem__(self._rest_name, _serialize(value, self._format)) - - def _get_deserialize_callable_from_annotation( - self, annotation: typing.Any - ) -> typing.Optional[typing.Callable[[typing.Any], typing.Any]]: - return _get_deserialize_callable_from_annotation(annotation, self._module, self) - - -def rest_field( - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - default: typing.Any = _UNSET, - format: typing.Optional[str] = None, - is_multipart_file_input: bool = False, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, -) -> typing.Any: - return _RestField( - name=name, - type=type, - visibility=visibility, - default=default, - format=format, - is_multipart_file_input=is_multipart_file_input, - xml=xml, - ) - - -def rest_discriminator( - *, - name: typing.Optional[str] = None, - type: typing.Optional[typing.Callable] = None, # pylint: disable=redefined-builtin - visibility: typing.Optional[typing.List[str]] = None, - xml: typing.Optional[typing.Dict[str, typing.Any]] = None, -) -> typing.Any: - return _RestField(name=name, type=type, is_discriminator=True, visibility=visibility, xml=xml) - - -def serialize_xml(model: Model, exclude_readonly: bool = False) -> str: - """Serialize a model to XML. - - :param Model model: The model to serialize. - :param bool exclude_readonly: Whether to exclude readonly properties. - :returns: The XML representation of the model. - :rtype: str - """ - return ET.tostring(_get_element(model, exclude_readonly), encoding="unicode") # type: ignore - - -def _get_element( - o: typing.Any, - exclude_readonly: bool = False, - parent_meta: typing.Optional[typing.Dict[str, typing.Any]] = None, - wrapped_element: typing.Optional[ET.Element] = None, -) -> typing.Union[ET.Element, typing.List[ET.Element]]: - if _is_model(o): - model_meta = getattr(o, "_xml", {}) - - # if prop is a model, then use the prop element directly, else generate a wrapper of model - if wrapped_element is None: - wrapped_element = _create_xml_element( - model_meta.get("name", o.__class__.__name__), - model_meta.get("prefix"), - model_meta.get("ns"), - ) - - readonly_props = [] - if exclude_readonly: - readonly_props = [p._rest_name for p in o._attr_to_rest_field.values() if _is_readonly(p)] - - for k, v in o.items(): - # do not serialize readonly properties - if exclude_readonly and k in readonly_props: - continue - - prop_rest_field = _get_rest_field(o._attr_to_rest_field, k) - if prop_rest_field: - prop_meta = getattr(prop_rest_field, "_xml").copy() - # use the wire name as xml name if no specific name is set - if prop_meta.get("name") is None: - prop_meta["name"] = k - else: - # additional properties will not have rest field, use the wire name as xml name - prop_meta = {"name": k} - - # if no ns for prop, use model's - if prop_meta.get("ns") is None and model_meta.get("ns"): - prop_meta["ns"] = model_meta.get("ns") - prop_meta["prefix"] = model_meta.get("prefix") - - if prop_meta.get("unwrapped", False): - # unwrapped could only set on array - wrapped_element.extend(_get_element(v, exclude_readonly, prop_meta)) - elif prop_meta.get("text", False): - # text could only set on primitive type - wrapped_element.text = _get_primitive_type_value(v) - elif prop_meta.get("attribute", False): - xml_name = prop_meta.get("name", k) - if prop_meta.get("ns"): - ET.register_namespace(prop_meta.get("prefix"), prop_meta.get("ns")) # pyright: ignore - xml_name = "{" + prop_meta.get("ns") + "}" + xml_name # pyright: ignore - # attribute should be primitive type - wrapped_element.set(xml_name, _get_primitive_type_value(v)) - else: - # other wrapped prop element - wrapped_element.append(_get_wrapped_element(v, exclude_readonly, prop_meta)) - return wrapped_element - if isinstance(o, list): - return [_get_element(x, exclude_readonly, parent_meta) for x in o] # type: ignore - if isinstance(o, dict): - result = [] - for k, v in o.items(): - result.append( - _get_wrapped_element( - v, - exclude_readonly, - { - "name": k, - "ns": parent_meta.get("ns") if parent_meta else None, - "prefix": parent_meta.get("prefix") if parent_meta else None, - }, - ) - ) - return result - - # primitive case need to create element based on parent_meta - if parent_meta: - return _get_wrapped_element( - o, - exclude_readonly, - { - "name": parent_meta.get("itemsName", parent_meta.get("name")), - "prefix": parent_meta.get("itemsPrefix", parent_meta.get("prefix")), - "ns": parent_meta.get("itemsNs", parent_meta.get("ns")), - }, - ) - - raise ValueError("Could not serialize value into xml: " + o) - - -def _get_wrapped_element( - v: typing.Any, - exclude_readonly: bool, - meta: typing.Optional[typing.Dict[str, typing.Any]], -) -> ET.Element: - wrapped_element = _create_xml_element( - meta.get("name") if meta else None, meta.get("prefix") if meta else None, meta.get("ns") if meta else None - ) - if isinstance(v, (dict, list)): - wrapped_element.extend(_get_element(v, exclude_readonly, meta)) - elif _is_model(v): - _get_element(v, exclude_readonly, meta, wrapped_element) - else: - wrapped_element.text = _get_primitive_type_value(v) - return wrapped_element - - -def _get_primitive_type_value(v) -> str: - if v is True: - return "true" - if v is False: - return "false" - if isinstance(v, _Null): - return "" - return str(v) - - -def _create_xml_element(tag, prefix=None, ns=None): - if prefix and ns: - ET.register_namespace(prefix, ns) - if ns: - return ET.Element("{" + ns + "}" + tag) - return ET.Element(tag) - - -def _deserialize_xml( - deserializer: typing.Any, - value: str, -) -> typing.Any: - element = ET.fromstring(value) # nosec - return _deserialize(deserializer, element) - - -def _convert_element(e: ET.Element): - # dict case - if len(e.attrib) > 0 or len({child.tag for child in e}) > 1: - dict_result: typing.Dict[str, typing.Any] = {} - for child in e: - if dict_result.get(child.tag) is not None: - if isinstance(dict_result[child.tag], list): - dict_result[child.tag].append(_convert_element(child)) - else: - dict_result[child.tag] = [dict_result[child.tag], _convert_element(child)] - else: - dict_result[child.tag] = _convert_element(child) - dict_result.update(e.attrib) - return dict_result - # array case - if len(e) > 0: - array_result: typing.List[typing.Any] = [] - for child in e: - array_result.append(_convert_element(child)) - return array_result - # primitive case - return e.text diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/serialization.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/serialization.py deleted file mode 100644 index eb86ea23c96..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_utils/serialization.py +++ /dev/null @@ -1,2032 +0,0 @@ -# pylint: disable=line-too-long,useless-suppression,too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -# pyright: reportUnnecessaryTypeIgnoreComment=false - -from base64 import b64decode, b64encode -import calendar -import datetime -import decimal -import email -from enum import Enum -import json -import logging -import re -import sys -import codecs -from typing import ( - Dict, - Any, - cast, - Optional, - Union, - AnyStr, - IO, - Mapping, - Callable, - MutableMapping, - List, -) - -try: - from urllib import quote # type: ignore -except ImportError: - from urllib.parse import quote -import xml.etree.ElementTree as ET - -import isodate # type: ignore -from typing_extensions import Self - -from azure.core.exceptions import DeserializationError, SerializationError -from azure.core.serialization import NULL as CoreNull - -_BOM = codecs.BOM_UTF8.decode(encoding="utf-8") - -JSON = MutableMapping[str, Any] - - -class RawDeserializer: - - # Accept "text" because we're open minded people... - JSON_REGEXP = re.compile(r"^(application|text)/([a-z+.]+\+)?json$") - - # Name used in context - CONTEXT_NAME = "deserialized_data" - - @classmethod - def deserialize_from_text(cls, data: Optional[Union[AnyStr, IO]], content_type: Optional[str] = None) -> Any: - """Decode data according to content-type. - - Accept a stream of data as well, but will be load at once in memory for now. - - If no content-type, will return the string version (not bytes, not stream) - - :param data: Input, could be bytes or stream (will be decoded with UTF8) or text - :type data: str or bytes or IO - :param str content_type: The content type. - :return: The deserialized data. - :rtype: object - """ - if hasattr(data, "read"): - # Assume a stream - data = cast(IO, data).read() - - if isinstance(data, bytes): - data_as_str = data.decode(encoding="utf-8-sig") - else: - # Explain to mypy the correct type. - data_as_str = cast(str, data) - - # Remove Byte Order Mark if present in string - data_as_str = data_as_str.lstrip(_BOM) - - if content_type is None: - return data - - if cls.JSON_REGEXP.match(content_type): - try: - return json.loads(data_as_str) - except ValueError as err: - raise DeserializationError("JSON is invalid: {}".format(err), err) from err - elif "xml" in (content_type or []): - try: - - try: - if isinstance(data, unicode): # type: ignore - # If I'm Python 2.7 and unicode XML will scream if I try a "fromstring" on unicode string - data_as_str = data_as_str.encode(encoding="utf-8") # type: ignore - except NameError: - pass - - return ET.fromstring(data_as_str) # nosec - except ET.ParseError as err: - # It might be because the server has an issue, and returned JSON with - # content-type XML.... - # So let's try a JSON load, and if it's still broken - # let's flow the initial exception - def _json_attemp(data): - try: - return True, json.loads(data) - except ValueError: - return False, None # Don't care about this one - - success, json_result = _json_attemp(data) - if success: - return json_result - # If i'm here, it's not JSON, it's not XML, let's scream - # and raise the last context in this block (the XML exception) - # The function hack is because Py2.7 messes up with exception - # context otherwise. - _LOGGER.critical("Wasn't XML not JSON, failing") - raise DeserializationError("XML is invalid") from err - elif content_type.startswith("text/"): - return data_as_str - raise DeserializationError("Cannot deserialize content-type: {}".format(content_type)) - - @classmethod - def deserialize_from_http_generics(cls, body_bytes: Optional[Union[AnyStr, IO]], headers: Mapping) -> Any: - """Deserialize from HTTP response. - - Use bytes and headers to NOT use any requests/aiohttp or whatever - specific implementation. - Headers will tested for "content-type" - - :param bytes body_bytes: The body of the response. - :param dict headers: The headers of the response. - :returns: The deserialized data. - :rtype: object - """ - # Try to use content-type from headers if available - content_type = None - if "content-type" in headers: - content_type = headers["content-type"].split(";")[0].strip().lower() - # Ouch, this server did not declare what it sent... - # Let's guess it's JSON... - # Also, since Autorest was considering that an empty body was a valid JSON, - # need that test as well.... - else: - content_type = "application/json" - - if body_bytes: - return cls.deserialize_from_text(body_bytes, content_type) - return None - - -_LOGGER = logging.getLogger(__name__) - -try: - _long_type = long # type: ignore -except NameError: - _long_type = int - -TZ_UTC = datetime.timezone.utc - -_FLATTEN = re.compile(r"(? None: - self.additional_properties: Optional[Dict[str, Any]] = {} - for k in kwargs: # pylint: disable=consider-using-dict-items - if k not in self._attribute_map: - _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__) - elif k in self._validation and self._validation[k].get("readonly", False): - _LOGGER.warning("Readonly attribute %s will be ignored in class %s", k, self.__class__) - else: - setattr(self, k, kwargs[k]) - - def __eq__(self, other: Any) -> bool: - """Compare objects by comparing all attributes. - - :param object other: The object to compare - :returns: True if objects are equal - :rtype: bool - """ - if isinstance(other, self.__class__): - return self.__dict__ == other.__dict__ - return False - - def __ne__(self, other: Any) -> bool: - """Compare objects by comparing all attributes. - - :param object other: The object to compare - :returns: True if objects are not equal - :rtype: bool - """ - return not self.__eq__(other) - - def __str__(self) -> str: - return str(self.__dict__) - - @classmethod - def enable_additional_properties_sending(cls) -> None: - cls._attribute_map["additional_properties"] = {"key": "", "type": "{object}"} - - @classmethod - def is_xml_model(cls) -> bool: - try: - cls._xml_map # type: ignore - except AttributeError: - return False - return True - - @classmethod - def _create_xml_node(cls): - """Create XML node. - - :returns: The XML node - :rtype: xml.etree.ElementTree.Element - """ - try: - xml_map = cls._xml_map # type: ignore - except AttributeError: - xml_map = {} - - return _create_xml_node(xml_map.get("name", cls.__name__), xml_map.get("prefix", None), xml_map.get("ns", None)) - - def serialize(self, keep_readonly: bool = False, **kwargs: Any) -> JSON: - """Return the JSON that would be sent to server from this model. - - This is an alias to `as_dict(full_restapi_key_transformer, keep_readonly=False)`. - - If you want XML serialization, you can pass the kwargs is_xml=True. - - :param bool keep_readonly: If you want to serialize the readonly attributes - :returns: A dict JSON compatible object - :rtype: dict - """ - serializer = Serializer(self._infer_class_models()) - return serializer._serialize( # type: ignore # pylint: disable=protected-access - self, keep_readonly=keep_readonly, **kwargs - ) - - def as_dict( - self, - keep_readonly: bool = True, - key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer, - **kwargs: Any - ) -> JSON: - """Return a dict that can be serialized using json.dump. - - Advanced usage might optionally use a callback as parameter: - - .. code::python - - def my_key_transformer(key, attr_desc, value): - return key - - Key is the attribute name used in Python. Attr_desc - is a dict of metadata. Currently contains 'type' with the - msrest type and 'key' with the RestAPI encoded key. - Value is the current value in this object. - - The string returned will be used to serialize the key. - If the return type is a list, this is considered hierarchical - result dict. - - See the three examples in this file: - - - attribute_transformer - - full_restapi_key_transformer - - last_restapi_key_transformer - - If you want XML serialization, you can pass the kwargs is_xml=True. - - :param bool keep_readonly: If you want to serialize the readonly attributes - :param function key_transformer: A key transformer function. - :returns: A dict JSON compatible object - :rtype: dict - """ - serializer = Serializer(self._infer_class_models()) - return serializer._serialize( # type: ignore # pylint: disable=protected-access - self, key_transformer=key_transformer, keep_readonly=keep_readonly, **kwargs - ) - - @classmethod - def _infer_class_models(cls): - try: - str_models = cls.__module__.rsplit(".", 1)[0] - models = sys.modules[str_models] - client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - if cls.__name__ not in client_models: - raise ValueError("Not Autorest generated code") - except Exception: # pylint: disable=broad-exception-caught - # Assume it's not Autorest generated (tests?). Add ourselves as dependencies. - client_models = {cls.__name__: cls} - return client_models - - @classmethod - def deserialize(cls, data: Any, content_type: Optional[str] = None) -> Self: - """Parse a str using the RestAPI syntax and return a model. - - :param str data: A str using RestAPI structure. JSON by default. - :param str content_type: JSON by default, set application/xml if XML. - :returns: An instance of this model - :raises DeserializationError: if something went wrong - :rtype: Self - """ - deserializer = Deserializer(cls._infer_class_models()) - return deserializer(cls.__name__, data, content_type=content_type) # type: ignore - - @classmethod - def from_dict( - cls, - data: Any, - key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None, - content_type: Optional[str] = None, - ) -> Self: - """Parse a dict using given key extractor return a model. - - By default consider key - extractors (rest_key_case_insensitive_extractor, attribute_key_case_insensitive_extractor - and last_rest_key_case_insensitive_extractor) - - :param dict data: A dict using RestAPI structure - :param function key_extractors: A key extractor function. - :param str content_type: JSON by default, set application/xml if XML. - :returns: An instance of this model - :raises DeserializationError: if something went wrong - :rtype: Self - """ - deserializer = Deserializer(cls._infer_class_models()) - deserializer.key_extractors = ( # type: ignore - [ # type: ignore - attribute_key_case_insensitive_extractor, - rest_key_case_insensitive_extractor, - last_rest_key_case_insensitive_extractor, - ] - if key_extractors is None - else key_extractors - ) - return deserializer(cls.__name__, data, content_type=content_type) # type: ignore - - @classmethod - def _flatten_subtype(cls, key, objects): - if "_subtype_map" not in cls.__dict__: - return {} - result = dict(cls._subtype_map[key]) - for valuetype in cls._subtype_map[key].values(): - result.update(objects[valuetype]._flatten_subtype(key, objects)) # pylint: disable=protected-access - return result - - @classmethod - def _classify(cls, response, objects): - """Check the class _subtype_map for any child classes. - We want to ignore any inherited _subtype_maps. - - :param dict response: The initial data - :param dict objects: The class objects - :returns: The class to be used - :rtype: class - """ - for subtype_key in cls.__dict__.get("_subtype_map", {}).keys(): - subtype_value = None - - if not isinstance(response, ET.Element): - rest_api_response_key = cls._get_rest_key_parts(subtype_key)[-1] - subtype_value = response.get(rest_api_response_key, None) or response.get(subtype_key, None) - else: - subtype_value = xml_key_extractor(subtype_key, cls._attribute_map[subtype_key], response) - if subtype_value: - # Try to match base class. Can be class name only - # (bug to fix in Autorest to support x-ms-discriminator-name) - if cls.__name__ == subtype_value: - return cls - flatten_mapping_type = cls._flatten_subtype(subtype_key, objects) - try: - return objects[flatten_mapping_type[subtype_value]] # type: ignore - except KeyError: - _LOGGER.warning( - "Subtype value %s has no mapping, use base class %s.", - subtype_value, - cls.__name__, - ) - break - else: - _LOGGER.warning("Discriminator %s is absent or null, use base class %s.", subtype_key, cls.__name__) - break - return cls - - @classmethod - def _get_rest_key_parts(cls, attr_key): - """Get the RestAPI key of this attr, split it and decode part - :param str attr_key: Attribute key must be in attribute_map. - :returns: A list of RestAPI part - :rtype: list - """ - rest_split_key = _FLATTEN.split(cls._attribute_map[attr_key]["key"]) - return [_decode_attribute_map_key(key_part) for key_part in rest_split_key] - - -def _decode_attribute_map_key(key): - """This decode a key in an _attribute_map to the actual key we want to look at - inside the received data. - - :param str key: A key string from the generated code - :returns: The decoded key - :rtype: str - """ - return key.replace("\\.", ".") - - -class Serializer: # pylint: disable=too-many-public-methods - """Request object model serializer.""" - - basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - - _xml_basic_types_serializers = {"bool": lambda x: str(x).lower()} - days = {0: "Mon", 1: "Tue", 2: "Wed", 3: "Thu", 4: "Fri", 5: "Sat", 6: "Sun"} - months = { - 1: "Jan", - 2: "Feb", - 3: "Mar", - 4: "Apr", - 5: "May", - 6: "Jun", - 7: "Jul", - 8: "Aug", - 9: "Sep", - 10: "Oct", - 11: "Nov", - 12: "Dec", - } - validation = { - "min_length": lambda x, y: len(x) < y, - "max_length": lambda x, y: len(x) > y, - "minimum": lambda x, y: x < y, - "maximum": lambda x, y: x > y, - "minimum_ex": lambda x, y: x <= y, - "maximum_ex": lambda x, y: x >= y, - "min_items": lambda x, y: len(x) < y, - "max_items": lambda x, y: len(x) > y, - "pattern": lambda x, y: not re.match(y, x, re.UNICODE), - "unique": lambda x, y: len(x) != len(set(x)), - "multiple": lambda x, y: x % y != 0, - } - - def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: - self.serialize_type = { - "iso-8601": Serializer.serialize_iso, - "rfc-1123": Serializer.serialize_rfc, - "unix-time": Serializer.serialize_unix, - "duration": Serializer.serialize_duration, - "date": Serializer.serialize_date, - "time": Serializer.serialize_time, - "decimal": Serializer.serialize_decimal, - "long": Serializer.serialize_long, - "bytearray": Serializer.serialize_bytearray, - "base64": Serializer.serialize_base64, - "object": self.serialize_object, - "[]": self.serialize_iter, - "{}": self.serialize_dict, - } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} - self.key_transformer = full_restapi_key_transformer - self.client_side_validation = True - - def _serialize( # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-statements, too-many-locals - self, target_obj, data_type=None, **kwargs - ): - """Serialize data into a string according to type. - - :param object target_obj: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str, dict - :raises SerializationError: if serialization fails. - :returns: The serialized data. - """ - key_transformer = kwargs.get("key_transformer", self.key_transformer) - keep_readonly = kwargs.get("keep_readonly", False) - if target_obj is None: - return None - - attr_name = None - class_name = target_obj.__class__.__name__ - - if data_type: - return self.serialize_data(target_obj, data_type, **kwargs) - - if not hasattr(target_obj, "_attribute_map"): - data_type = type(target_obj).__name__ - if data_type in self.basic_types.values(): - return self.serialize_data(target_obj, data_type, **kwargs) - - # Force "is_xml" kwargs if we detect a XML model - try: - is_xml_model_serialization = kwargs["is_xml"] - except KeyError: - is_xml_model_serialization = kwargs.setdefault("is_xml", target_obj.is_xml_model()) - - serialized = {} - if is_xml_model_serialization: - serialized = target_obj._create_xml_node() # pylint: disable=protected-access - try: - attributes = target_obj._attribute_map # pylint: disable=protected-access - for attr, attr_desc in attributes.items(): - attr_name = attr - if not keep_readonly and target_obj._validation.get( # pylint: disable=protected-access - attr_name, {} - ).get("readonly", False): - continue - - if attr_name == "additional_properties" and attr_desc["key"] == "": - if target_obj.additional_properties is not None: - serialized.update(target_obj.additional_properties) - continue - try: - - orig_attr = getattr(target_obj, attr) - if is_xml_model_serialization: - pass # Don't provide "transformer" for XML for now. Keep "orig_attr" - else: # JSON - keys, orig_attr = key_transformer(attr, attr_desc.copy(), orig_attr) - keys = keys if isinstance(keys, list) else [keys] - - kwargs["serialization_ctxt"] = attr_desc - new_attr = self.serialize_data(orig_attr, attr_desc["type"], **kwargs) - - if is_xml_model_serialization: - xml_desc = attr_desc.get("xml", {}) - xml_name = xml_desc.get("name", attr_desc["key"]) - xml_prefix = xml_desc.get("prefix", None) - xml_ns = xml_desc.get("ns", None) - if xml_desc.get("attr", False): - if xml_ns: - ET.register_namespace(xml_prefix, xml_ns) - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - serialized.set(xml_name, new_attr) # type: ignore - continue - if xml_desc.get("text", False): - serialized.text = new_attr # type: ignore - continue - if isinstance(new_attr, list): - serialized.extend(new_attr) # type: ignore - elif isinstance(new_attr, ET.Element): - # If the down XML has no XML/Name, - # we MUST replace the tag with the local tag. But keeping the namespaces. - if "name" not in getattr(orig_attr, "_xml_map", {}): - splitted_tag = new_attr.tag.split("}") - if len(splitted_tag) == 2: # Namespace - new_attr.tag = "}".join([splitted_tag[0], xml_name]) - else: - new_attr.tag = xml_name - serialized.append(new_attr) # type: ignore - else: # That's a basic type - # Integrate namespace if necessary - local_node = _create_xml_node(xml_name, xml_prefix, xml_ns) - local_node.text = str(new_attr) - serialized.append(local_node) # type: ignore - else: # JSON - for k in reversed(keys): # type: ignore - new_attr = {k: new_attr} - - _new_attr = new_attr - _serialized = serialized - for k in keys: # type: ignore - if k not in _serialized: - _serialized.update(_new_attr) # type: ignore - _new_attr = _new_attr[k] # type: ignore - _serialized = _serialized[k] - except ValueError as err: - if isinstance(err, SerializationError): - raise - - except (AttributeError, KeyError, TypeError) as err: - msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj)) - raise SerializationError(msg) from err - return serialized - - def body(self, data, data_type, **kwargs): - """Serialize data intended for a request body. - - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: dict - :raises SerializationError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized request body - """ - - # Just in case this is a dict - internal_data_type_str = data_type.strip("[]{}") - internal_data_type = self.dependencies.get(internal_data_type_str, None) - try: - is_xml_model_serialization = kwargs["is_xml"] - except KeyError: - if internal_data_type and issubclass(internal_data_type, Model): - is_xml_model_serialization = kwargs.setdefault("is_xml", internal_data_type.is_xml_model()) - else: - is_xml_model_serialization = False - if internal_data_type and not isinstance(internal_data_type, Enum): - try: - deserializer = Deserializer(self.dependencies) - # Since it's on serialization, it's almost sure that format is not JSON REST - # We're not able to deal with additional properties for now. - deserializer.additional_properties_detection = False - if is_xml_model_serialization: - deserializer.key_extractors = [ # type: ignore - attribute_key_case_insensitive_extractor, - ] - else: - deserializer.key_extractors = [ - rest_key_case_insensitive_extractor, - attribute_key_case_insensitive_extractor, - last_rest_key_case_insensitive_extractor, - ] - data = deserializer._deserialize(data_type, data) # pylint: disable=protected-access - except DeserializationError as err: - raise SerializationError("Unable to build a model: " + str(err)) from err - - return self._serialize(data, data_type, **kwargs) - - def url(self, name, data, data_type, **kwargs): - """Serialize data intended for a URL path. - - :param str name: The name of the URL path parameter. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str - :returns: The serialized URL path - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - """ - try: - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - - if kwargs.get("skip_quote") is True: - output = str(output) - output = output.replace("{", quote("{")).replace("}", quote("}")) - else: - output = quote(str(output), safe="") - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return output - - def query(self, name, data, data_type, **kwargs): - """Serialize data intended for a URL query. - - :param str name: The name of the query parameter. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str, list - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized query parameter - """ - try: - # Treat the list aside, since we don't want to encode the div separator - if data_type.startswith("["): - internal_data_type = data_type[1:-1] - do_quote = not kwargs.get("skip_quote", False) - return self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs) - - # Not a list, regular serialization - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - if kwargs.get("skip_quote") is True: - output = str(output) - else: - output = quote(str(output), safe="") - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return str(output) - - def header(self, name, data, data_type, **kwargs): - """Serialize data intended for a request header. - - :param str name: The name of the header. - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :rtype: str - :raises TypeError: if serialization fails. - :raises ValueError: if data is None - :returns: The serialized header - """ - try: - if data_type in ["[str]"]: - data = ["" if d is None else d for d in data] - - output = self.serialize_data(data, data_type, **kwargs) - if data_type == "bool": - output = json.dumps(output) - except SerializationError as exc: - raise TypeError("{} must be type {}.".format(name, data_type)) from exc - return str(output) - - def serialize_data(self, data, data_type, **kwargs): - """Serialize generic data according to supplied data type. - - :param object data: The data to be serialized. - :param str data_type: The type to be serialized from. - :raises AttributeError: if required data is None. - :raises ValueError: if data is None - :raises SerializationError: if serialization fails. - :returns: The serialized data. - :rtype: str, int, float, bool, dict, list - """ - if data is None: - raise ValueError("No value for given attribute") - - try: - if data is CoreNull: - return None - if data_type in self.basic_types.values(): - return self.serialize_basic(data, data_type, **kwargs) - - if data_type in self.serialize_type: - return self.serialize_type[data_type](data, **kwargs) - - # If dependencies is empty, try with current data class - # It has to be a subclass of Enum anyway - enum_type = self.dependencies.get(data_type, data.__class__) - if issubclass(enum_type, Enum): - return Serializer.serialize_enum(data, enum_obj=enum_type) - - iter_type = data_type[0] + data_type[-1] - if iter_type in self.serialize_type: - return self.serialize_type[iter_type](data, data_type[1:-1], **kwargs) - - except (ValueError, TypeError) as err: - msg = "Unable to serialize value: {!r} as type: {!r}." - raise SerializationError(msg.format(data, data_type)) from err - return self._serialize(data, **kwargs) - - @classmethod - def _get_custom_serializers(cls, data_type, **kwargs): # pylint: disable=inconsistent-return-statements - custom_serializer = kwargs.get("basic_types_serializers", {}).get(data_type) - if custom_serializer: - return custom_serializer - if kwargs.get("is_xml", False): - return cls._xml_basic_types_serializers.get(data_type) - - @classmethod - def serialize_basic(cls, data, data_type, **kwargs): - """Serialize basic builting data type. - Serializes objects to str, int, float or bool. - - Possible kwargs: - - basic_types_serializers dict[str, callable] : If set, use the callable as serializer - - is_xml bool : If set, use xml_basic_types_serializers - - :param obj data: Object to be serialized. - :param str data_type: Type of object in the iterable. - :rtype: str, int, float, bool - :return: serialized object - """ - custom_serializer = cls._get_custom_serializers(data_type, **kwargs) - if custom_serializer: - return custom_serializer(data) - if data_type == "str": - return cls.serialize_unicode(data) - return eval(data_type)(data) # nosec # pylint: disable=eval-used - - @classmethod - def serialize_unicode(cls, data): - """Special handling for serializing unicode strings in Py2. - Encode to UTF-8 if unicode, otherwise handle as a str. - - :param str data: Object to be serialized. - :rtype: str - :return: serialized object - """ - try: # If I received an enum, return its value - return data.value - except AttributeError: - pass - - try: - if isinstance(data, unicode): # type: ignore - # Don't change it, JSON and XML ElementTree are totally able - # to serialize correctly u'' strings - return data - except NameError: - return str(data) - return str(data) - - def serialize_iter(self, data, iter_type, div=None, **kwargs): - """Serialize iterable. - - Supported kwargs: - - serialization_ctxt dict : The current entry of _attribute_map, or same format. - serialization_ctxt['type'] should be same as data_type. - - is_xml bool : If set, serialize as XML - - :param list data: Object to be serialized. - :param str iter_type: Type of object in the iterable. - :param str div: If set, this str will be used to combine the elements - in the iterable into a combined string. Default is 'None'. - Defaults to False. - :rtype: list, str - :return: serialized iterable - """ - if isinstance(data, str): - raise SerializationError("Refuse str type as a valid iter type.") - - serialization_ctxt = kwargs.get("serialization_ctxt", {}) - is_xml = kwargs.get("is_xml", False) - - serialized = [] - for d in data: - try: - serialized.append(self.serialize_data(d, iter_type, **kwargs)) - except ValueError as err: - if isinstance(err, SerializationError): - raise - serialized.append(None) - - if kwargs.get("do_quote", False): - serialized = ["" if s is None else quote(str(s), safe="") for s in serialized] - - if div: - serialized = ["" if s is None else str(s) for s in serialized] - serialized = div.join(serialized) - - if "xml" in serialization_ctxt or is_xml: - # XML serialization is more complicated - xml_desc = serialization_ctxt.get("xml", {}) - xml_name = xml_desc.get("name") - if not xml_name: - xml_name = serialization_ctxt["key"] - - # Create a wrap node if necessary (use the fact that Element and list have "append") - is_wrapped = xml_desc.get("wrapped", False) - node_name = xml_desc.get("itemsName", xml_name) - if is_wrapped: - final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - else: - final_result = [] - # All list elements to "local_node" - for el in serialized: - if isinstance(el, ET.Element): - el_node = el - else: - el_node = _create_xml_node(node_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - if el is not None: # Otherwise it writes "None" :-p - el_node.text = str(el) - final_result.append(el_node) - return final_result - return serialized - - def serialize_dict(self, attr, dict_type, **kwargs): - """Serialize a dictionary of objects. - - :param dict attr: Object to be serialized. - :param str dict_type: Type of object in the dictionary. - :rtype: dict - :return: serialized dictionary - """ - serialization_ctxt = kwargs.get("serialization_ctxt", {}) - serialized = {} - for key, value in attr.items(): - try: - serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs) - except ValueError as err: - if isinstance(err, SerializationError): - raise - serialized[self.serialize_unicode(key)] = None - - if "xml" in serialization_ctxt: - # XML serialization is more complicated - xml_desc = serialization_ctxt["xml"] - xml_name = xml_desc["name"] - - final_result = _create_xml_node(xml_name, xml_desc.get("prefix", None), xml_desc.get("ns", None)) - for key, value in serialized.items(): - ET.SubElement(final_result, key).text = value - return final_result - - return serialized - - def serialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements - """Serialize a generic object. - This will be handled as a dictionary. If object passed in is not - a basic type (str, int, float, dict, list) it will simply be - cast to str. - - :param dict attr: Object to be serialized. - :rtype: dict or str - :return: serialized object - """ - if attr is None: - return None - if isinstance(attr, ET.Element): - return attr - obj_type = type(attr) - if obj_type in self.basic_types: - return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs) - if obj_type is _long_type: - return self.serialize_long(attr) - if obj_type is str: - return self.serialize_unicode(attr) - if obj_type is datetime.datetime: - return self.serialize_iso(attr) - if obj_type is datetime.date: - return self.serialize_date(attr) - if obj_type is datetime.time: - return self.serialize_time(attr) - if obj_type is datetime.timedelta: - return self.serialize_duration(attr) - if obj_type is decimal.Decimal: - return self.serialize_decimal(attr) - - # If it's a model or I know this dependency, serialize as a Model - if obj_type in self.dependencies.values() or isinstance(attr, Model): - return self._serialize(attr) - - if obj_type == dict: - serialized = {} - for key, value in attr.items(): - try: - serialized[self.serialize_unicode(key)] = self.serialize_object(value, **kwargs) - except ValueError: - serialized[self.serialize_unicode(key)] = None - return serialized - - if obj_type == list: - serialized = [] - for obj in attr: - try: - serialized.append(self.serialize_object(obj, **kwargs)) - except ValueError: - pass - return serialized - return str(attr) - - @staticmethod - def serialize_enum(attr, enum_obj=None): - try: - result = attr.value - except AttributeError: - result = attr - try: - enum_obj(result) # type: ignore - return result - except ValueError as exc: - for enum_value in enum_obj: # type: ignore - if enum_value.value.lower() == str(attr).lower(): - return enum_value.value - error = "{!r} is not valid value for enum {!r}" - raise SerializationError(error.format(attr, enum_obj)) from exc - - @staticmethod - def serialize_bytearray(attr, **kwargs): # pylint: disable=unused-argument - """Serialize bytearray into base-64 string. - - :param str attr: Object to be serialized. - :rtype: str - :return: serialized base64 - """ - return b64encode(attr).decode() - - @staticmethod - def serialize_base64(attr, **kwargs): # pylint: disable=unused-argument - """Serialize str into base-64 string. - - :param str attr: Object to be serialized. - :rtype: str - :return: serialized base64 - """ - encoded = b64encode(attr).decode("ascii") - return encoded.strip("=").replace("+", "-").replace("/", "_") - - @staticmethod - def serialize_decimal(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Decimal object to float. - - :param decimal attr: Object to be serialized. - :rtype: float - :return: serialized decimal - """ - return float(attr) - - @staticmethod - def serialize_long(attr, **kwargs): # pylint: disable=unused-argument - """Serialize long (Py2) or int (Py3). - - :param int attr: Object to be serialized. - :rtype: int/long - :return: serialized long - """ - return _long_type(attr) - - @staticmethod - def serialize_date(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Date object into ISO-8601 formatted string. - - :param Date attr: Object to be serialized. - :rtype: str - :return: serialized date - """ - if isinstance(attr, str): - attr = isodate.parse_date(attr) - t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day) - return t - - @staticmethod - def serialize_time(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Time object into ISO-8601 formatted string. - - :param datetime.time attr: Object to be serialized. - :rtype: str - :return: serialized time - """ - if isinstance(attr, str): - attr = isodate.parse_time(attr) - t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second) - if attr.microsecond: - t += ".{:02}".format(attr.microsecond) - return t - - @staticmethod - def serialize_duration(attr, **kwargs): # pylint: disable=unused-argument - """Serialize TimeDelta object into ISO-8601 formatted string. - - :param TimeDelta attr: Object to be serialized. - :rtype: str - :return: serialized duration - """ - if isinstance(attr, str): - attr = isodate.parse_duration(attr) - return isodate.duration_isoformat(attr) - - @staticmethod - def serialize_rfc(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into RFC-1123 formatted string. - - :param Datetime attr: Object to be serialized. - :rtype: str - :raises TypeError: if format invalid. - :return: serialized rfc - """ - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - utc = attr.utctimetuple() - except AttributeError as exc: - raise TypeError("RFC1123 object must be valid Datetime object.") from exc - - return "{}, {:02} {} {:04} {:02}:{:02}:{:02} GMT".format( - Serializer.days[utc.tm_wday], - utc.tm_mday, - Serializer.months[utc.tm_mon], - utc.tm_year, - utc.tm_hour, - utc.tm_min, - utc.tm_sec, - ) - - @staticmethod - def serialize_iso(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into ISO-8601 formatted string. - - :param Datetime attr: Object to be serialized. - :rtype: str - :raises SerializationError: if format invalid. - :return: serialized iso - """ - if isinstance(attr, str): - attr = isodate.parse_datetime(attr) - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - utc = attr.utctimetuple() - if utc.tm_year > 9999 or utc.tm_year < 1: - raise OverflowError("Hit max or min date") - - microseconds = str(attr.microsecond).rjust(6, "0").rstrip("0").ljust(3, "0") - if microseconds: - microseconds = "." + microseconds - date = "{:04}-{:02}-{:02}T{:02}:{:02}:{:02}".format( - utc.tm_year, utc.tm_mon, utc.tm_mday, utc.tm_hour, utc.tm_min, utc.tm_sec - ) - return date + microseconds + "Z" - except (ValueError, OverflowError) as err: - msg = "Unable to serialize datetime object." - raise SerializationError(msg) from err - except AttributeError as err: - msg = "ISO-8601 object must be valid Datetime object." - raise TypeError(msg) from err - - @staticmethod - def serialize_unix(attr, **kwargs): # pylint: disable=unused-argument - """Serialize Datetime object into IntTime format. - This is represented as seconds. - - :param Datetime attr: Object to be serialized. - :rtype: int - :raises SerializationError: if format invalid - :return: serialied unix - """ - if isinstance(attr, int): - return attr - try: - if not attr.tzinfo: - _LOGGER.warning("Datetime with no tzinfo will be considered UTC.") - return int(calendar.timegm(attr.utctimetuple())) - except AttributeError as exc: - raise TypeError("Unix time object must be valid Datetime object.") from exc - - -def rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - key = attr_desc["key"] - working_data = data - - while "." in key: - # Need the cast, as for some reasons "split" is typed as list[str | Any] - dict_keys = cast(List[str], _FLATTEN.split(key)) - if len(dict_keys) == 1: - key = _decode_attribute_map_key(dict_keys[0]) - break - working_key = _decode_attribute_map_key(dict_keys[0]) - working_data = working_data.get(working_key, data) - if working_data is None: - # If at any point while following flatten JSON path see None, it means - # that all properties under are None as well - return None - key = ".".join(dict_keys[1:]) - - return working_data.get(key) - - -def rest_key_case_insensitive_extractor( # pylint: disable=unused-argument, inconsistent-return-statements - attr, attr_desc, data -): - key = attr_desc["key"] - working_data = data - - while "." in key: - dict_keys = _FLATTEN.split(key) - if len(dict_keys) == 1: - key = _decode_attribute_map_key(dict_keys[0]) - break - working_key = _decode_attribute_map_key(dict_keys[0]) - working_data = attribute_key_case_insensitive_extractor(working_key, None, working_data) - if working_data is None: - # If at any point while following flatten JSON path see None, it means - # that all properties under are None as well - return None - key = ".".join(dict_keys[1:]) - - if working_data: - return attribute_key_case_insensitive_extractor(key, None, working_data) - - -def last_rest_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - """Extract the attribute in "data" based on the last part of the JSON path key. - - :param str attr: The attribute to extract - :param dict attr_desc: The attribute description - :param dict data: The data to extract from - :rtype: object - :returns: The extracted attribute - """ - key = attr_desc["key"] - dict_keys = _FLATTEN.split(key) - return attribute_key_extractor(dict_keys[-1], None, data) - - -def last_rest_key_case_insensitive_extractor(attr, attr_desc, data): # pylint: disable=unused-argument - """Extract the attribute in "data" based on the last part of the JSON path key. - - This is the case insensitive version of "last_rest_key_extractor" - :param str attr: The attribute to extract - :param dict attr_desc: The attribute description - :param dict data: The data to extract from - :rtype: object - :returns: The extracted attribute - """ - key = attr_desc["key"] - dict_keys = _FLATTEN.split(key) - return attribute_key_case_insensitive_extractor(dict_keys[-1], None, data) - - -def attribute_key_extractor(attr, _, data): - return data.get(attr) - - -def attribute_key_case_insensitive_extractor(attr, _, data): - found_key = None - lower_attr = attr.lower() - for key in data: - if lower_attr == key.lower(): - found_key = key - break - - return data.get(found_key) - - -def _extract_name_from_internal_type(internal_type): - """Given an internal type XML description, extract correct XML name with namespace. - - :param dict internal_type: An model type - :rtype: tuple - :returns: A tuple XML name + namespace dict - """ - internal_type_xml_map = getattr(internal_type, "_xml_map", {}) - xml_name = internal_type_xml_map.get("name", internal_type.__name__) - xml_ns = internal_type_xml_map.get("ns", None) - if xml_ns: - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - return xml_name - - -def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument,too-many-return-statements - if isinstance(data, dict): - return None - - # Test if this model is XML ready first - if not isinstance(data, ET.Element): - return None - - xml_desc = attr_desc.get("xml", {}) - xml_name = xml_desc.get("name", attr_desc["key"]) - - # Look for a children - is_iter_type = attr_desc["type"].startswith("[") - is_wrapped = xml_desc.get("wrapped", False) - internal_type = attr_desc.get("internalType", None) - internal_type_xml_map = getattr(internal_type, "_xml_map", {}) - - # Integrate namespace if necessary - xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None)) - if xml_ns: - xml_name = "{{{}}}{}".format(xml_ns, xml_name) - - # If it's an attribute, that's simple - if xml_desc.get("attr", False): - return data.get(xml_name) - - # If it's x-ms-text, that's simple too - if xml_desc.get("text", False): - return data.text - - # Scenario where I take the local name: - # - Wrapped node - # - Internal type is an enum (considered basic types) - # - Internal type has no XML/Name node - if is_wrapped or (internal_type and (issubclass(internal_type, Enum) or "name" not in internal_type_xml_map)): - children = data.findall(xml_name) - # If internal type has a local name and it's not a list, I use that name - elif not is_iter_type and internal_type and "name" in internal_type_xml_map: - xml_name = _extract_name_from_internal_type(internal_type) - children = data.findall(xml_name) - # That's an array - else: - if internal_type: # Complex type, ignore itemsName and use the complex type name - items_name = _extract_name_from_internal_type(internal_type) - else: - items_name = xml_desc.get("itemsName", xml_name) - children = data.findall(items_name) - - if len(children) == 0: - if is_iter_type: - if is_wrapped: - return None # is_wrapped no node, we want None - return [] # not wrapped, assume empty list - return None # Assume it's not there, maybe an optional node. - - # If is_iter_type and not wrapped, return all found children - if is_iter_type: - if not is_wrapped: - return children - # Iter and wrapped, should have found one node only (the wrap one) - if len(children) != 1: - raise DeserializationError( - "Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( - xml_name - ) - ) - return list(children[0]) # Might be empty list and that's ok. - - # Here it's not a itertype, we should have found one element only or empty - if len(children) > 1: - raise DeserializationError("Find several XML '{}' where it was not expected".format(xml_name)) - return children[0] - - -class Deserializer: - """Response object model deserializer. - - :param dict classes: Class type dictionary for deserializing complex types. - :ivar list key_extractors: Ordered list of extractors to be used by this deserializer. - """ - - basic_types = {str: "str", int: "int", bool: "bool", float: "float"} - - valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?") - - def __init__(self, classes: Optional[Mapping[str, type]] = None) -> None: - self.deserialize_type = { - "iso-8601": Deserializer.deserialize_iso, - "rfc-1123": Deserializer.deserialize_rfc, - "unix-time": Deserializer.deserialize_unix, - "duration": Deserializer.deserialize_duration, - "date": Deserializer.deserialize_date, - "time": Deserializer.deserialize_time, - "decimal": Deserializer.deserialize_decimal, - "long": Deserializer.deserialize_long, - "bytearray": Deserializer.deserialize_bytearray, - "base64": Deserializer.deserialize_base64, - "object": self.deserialize_object, - "[]": self.deserialize_iter, - "{}": self.deserialize_dict, - } - self.deserialize_expected_types = { - "duration": (isodate.Duration, datetime.timedelta), - "iso-8601": (datetime.datetime), - } - self.dependencies: Dict[str, type] = dict(classes) if classes else {} - self.key_extractors = [rest_key_extractor, xml_key_extractor] - # Additional properties only works if the "rest_key_extractor" is used to - # extract the keys. Making it to work whatever the key extractor is too much - # complicated, with no real scenario for now. - # So adding a flag to disable additional properties detection. This flag should be - # used if your expect the deserialization to NOT come from a JSON REST syntax. - # Otherwise, result are unexpected - self.additional_properties_detection = True - - def __call__(self, target_obj, response_data, content_type=None): - """Call the deserializer to process a REST response. - - :param str target_obj: Target data type to deserialize to. - :param requests.Response response_data: REST response object. - :param str content_type: Swagger "produces" if available. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - data = self._unpack_content(response_data, content_type) - return self._deserialize(target_obj, data) - - def _deserialize(self, target_obj, data): # pylint: disable=inconsistent-return-statements - """Call the deserializer on a model. - - Data needs to be already deserialized as JSON or XML ElementTree - - :param str target_obj: Target data type to deserialize to. - :param object data: Object to deserialize. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - # This is already a model, go recursive just in case - if hasattr(data, "_attribute_map"): - constants = [name for name, config in getattr(data, "_validation", {}).items() if config.get("constant")] - try: - for attr, mapconfig in data._attribute_map.items(): # pylint: disable=protected-access - if attr in constants: - continue - value = getattr(data, attr) - if value is None: - continue - local_type = mapconfig["type"] - internal_data_type = local_type.strip("[]{}") - if internal_data_type not in self.dependencies or isinstance(internal_data_type, Enum): - continue - setattr(data, attr, self._deserialize(local_type, value)) - return data - except AttributeError: - return - - response, class_name = self._classify_target(target_obj, data) - - if isinstance(response, str): - return self.deserialize_data(data, response) - if isinstance(response, type) and issubclass(response, Enum): - return self.deserialize_enum(data, response) - - if data is None or data is CoreNull: - return data - try: - attributes = response._attribute_map # type: ignore # pylint: disable=protected-access - d_attrs = {} - for attr, attr_desc in attributes.items(): - # Check empty string. If it's not empty, someone has a real "additionalProperties"... - if attr == "additional_properties" and attr_desc["key"] == "": - continue - raw_value = None - # Enhance attr_desc with some dynamic data - attr_desc = attr_desc.copy() # Do a copy, do not change the real one - internal_data_type = attr_desc["type"].strip("[]{}") - if internal_data_type in self.dependencies: - attr_desc["internalType"] = self.dependencies[internal_data_type] - - for key_extractor in self.key_extractors: - found_value = key_extractor(attr, attr_desc, data) - if found_value is not None: - if raw_value is not None and raw_value != found_value: - msg = ( - "Ignoring extracted value '%s' from %s for key '%s'" - " (duplicate extraction, follow extractors order)" - ) - _LOGGER.warning(msg, found_value, key_extractor, attr) - continue - raw_value = found_value - - value = self.deserialize_data(raw_value, attr_desc["type"]) - d_attrs[attr] = value - except (AttributeError, TypeError, KeyError) as err: - msg = "Unable to deserialize to object: " + class_name # type: ignore - raise DeserializationError(msg) from err - additional_properties = self._build_additional_properties(attributes, data) - return self._instantiate_model(response, d_attrs, additional_properties) - - def _build_additional_properties(self, attribute_map, data): - if not self.additional_properties_detection: - return None - if "additional_properties" in attribute_map and attribute_map.get("additional_properties", {}).get("key") != "": - # Check empty string. If it's not empty, someone has a real "additionalProperties" - return None - if isinstance(data, ET.Element): - data = {el.tag: el.text for el in data} - - known_keys = { - _decode_attribute_map_key(_FLATTEN.split(desc["key"])[0]) - for desc in attribute_map.values() - if desc["key"] != "" - } - present_keys = set(data.keys()) - missing_keys = present_keys - known_keys - return {key: data[key] for key in missing_keys} - - def _classify_target(self, target, data): - """Check to see whether the deserialization target object can - be classified into a subclass. - Once classification has been determined, initialize object. - - :param str target: The target object type to deserialize to. - :param str/dict data: The response data to deserialize. - :return: The classified target object and its class name. - :rtype: tuple - """ - if target is None: - return None, None - - if isinstance(target, str): - try: - target = self.dependencies[target] - except KeyError: - return target, target - - try: - target = target._classify(data, self.dependencies) # type: ignore # pylint: disable=protected-access - except AttributeError: - pass # Target is not a Model, no classify - return target, target.__class__.__name__ # type: ignore - - def failsafe_deserialize(self, target_obj, data, content_type=None): - """Ignores any errors encountered in deserialization, - and falls back to not deserializing the object. Recommended - for use in error deserialization, as we want to return the - HttpResponseError to users, and not have them deal with - a deserialization error. - - :param str target_obj: The target object type to deserialize to. - :param str/dict data: The response data to deserialize. - :param str content_type: Swagger "produces" if available. - :return: Deserialized object. - :rtype: object - """ - try: - return self(target_obj, data, content_type=content_type) - except: # pylint: disable=bare-except - _LOGGER.debug( - "Ran into a deserialization error. Ignoring since this is failsafe deserialization", exc_info=True - ) - return None - - @staticmethod - def _unpack_content(raw_data, content_type=None): - """Extract the correct structure for deserialization. - - If raw_data is a PipelineResponse, try to extract the result of RawDeserializer. - if we can't, raise. Your Pipeline should have a RawDeserializer. - - If not a pipeline response and raw_data is bytes or string, use content-type - to decode it. If no content-type, try JSON. - - If raw_data is something else, bypass all logic and return it directly. - - :param obj raw_data: Data to be processed. - :param str content_type: How to parse if raw_data is a string/bytes. - :raises JSONDecodeError: If JSON is requested and parsing is impossible. - :raises UnicodeDecodeError: If bytes is not UTF8 - :rtype: object - :return: Unpacked content. - """ - # Assume this is enough to detect a Pipeline Response without importing it - context = getattr(raw_data, "context", {}) - if context: - if RawDeserializer.CONTEXT_NAME in context: - return context[RawDeserializer.CONTEXT_NAME] - raise ValueError("This pipeline didn't have the RawDeserializer policy; can't deserialize") - - # Assume this is enough to recognize universal_http.ClientResponse without importing it - if hasattr(raw_data, "body"): - return RawDeserializer.deserialize_from_http_generics(raw_data.text(), raw_data.headers) - - # Assume this enough to recognize requests.Response without importing it. - if hasattr(raw_data, "_content_consumed"): - return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers) - - if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"): - return RawDeserializer.deserialize_from_text(raw_data, content_type) # type: ignore - return raw_data - - def _instantiate_model(self, response, attrs, additional_properties=None): - """Instantiate a response model passing in deserialized args. - - :param Response response: The response model class. - :param dict attrs: The deserialized response attributes. - :param dict additional_properties: Additional properties to be set. - :rtype: Response - :return: The instantiated response model. - """ - if callable(response): - subtype = getattr(response, "_subtype_map", {}) - try: - readonly = [ - k - for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore - if v.get("readonly") - ] - const = [ - k - for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore - if v.get("constant") - ] - kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} - response_obj = response(**kwargs) - for attr in readonly: - setattr(response_obj, attr, attrs.get(attr)) - if additional_properties: - response_obj.additional_properties = additional_properties # type: ignore - return response_obj - except TypeError as err: - msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore - raise DeserializationError(msg + str(err)) from err - else: - try: - for attr, value in attrs.items(): - setattr(response, attr, value) - return response - except Exception as exp: - msg = "Unable to populate response model. " - msg += "Type: {}, Error: {}".format(type(response), exp) - raise DeserializationError(msg) from exp - - def deserialize_data(self, data, data_type): # pylint: disable=too-many-return-statements - """Process data for deserialization according to data type. - - :param str data: The response string to be deserialized. - :param str data_type: The type to deserialize to. - :raises DeserializationError: if deserialization fails. - :return: Deserialized object. - :rtype: object - """ - if data is None: - return data - - try: - if not data_type: - return data - if data_type in self.basic_types.values(): - return self.deserialize_basic(data, data_type) - if data_type in self.deserialize_type: - if isinstance(data, self.deserialize_expected_types.get(data_type, tuple())): - return data - - is_a_text_parsing_type = lambda x: x not in [ # pylint: disable=unnecessary-lambda-assignment - "object", - "[]", - r"{}", - ] - if isinstance(data, ET.Element) and is_a_text_parsing_type(data_type) and not data.text: - return None - data_val = self.deserialize_type[data_type](data) - return data_val - - iter_type = data_type[0] + data_type[-1] - if iter_type in self.deserialize_type: - return self.deserialize_type[iter_type](data, data_type[1:-1]) - - obj_type = self.dependencies[data_type] - if issubclass(obj_type, Enum): - if isinstance(data, ET.Element): - data = data.text - return self.deserialize_enum(data, obj_type) - - except (ValueError, TypeError, AttributeError) as err: - msg = "Unable to deserialize response data." - msg += " Data: {}, {}".format(data, data_type) - raise DeserializationError(msg) from err - return self._deserialize(obj_type, data) - - def deserialize_iter(self, attr, iter_type): - """Deserialize an iterable. - - :param list attr: Iterable to be deserialized. - :param str iter_type: The type of object in the iterable. - :return: Deserialized iterable. - :rtype: list - """ - if attr is None: - return None - if isinstance(attr, ET.Element): # If I receive an element here, get the children - attr = list(attr) - if not isinstance(attr, (list, set)): - raise DeserializationError("Cannot deserialize as [{}] an object of type {}".format(iter_type, type(attr))) - return [self.deserialize_data(a, iter_type) for a in attr] - - def deserialize_dict(self, attr, dict_type): - """Deserialize a dictionary. - - :param dict/list attr: Dictionary to be deserialized. Also accepts - a list of key, value pairs. - :param str dict_type: The object type of the items in the dictionary. - :return: Deserialized dictionary. - :rtype: dict - """ - if isinstance(attr, list): - return {x["key"]: self.deserialize_data(x["value"], dict_type) for x in attr} - - if isinstance(attr, ET.Element): - # Transform value into {"Key": "value"} - attr = {el.tag: el.text for el in attr} - return {k: self.deserialize_data(v, dict_type) for k, v in attr.items()} - - def deserialize_object(self, attr, **kwargs): # pylint: disable=too-many-return-statements - """Deserialize a generic object. - This will be handled as a dictionary. - - :param dict attr: Dictionary to be deserialized. - :return: Deserialized object. - :rtype: dict - :raises TypeError: if non-builtin datatype encountered. - """ - if attr is None: - return None - if isinstance(attr, ET.Element): - # Do no recurse on XML, just return the tree as-is - return attr - if isinstance(attr, str): - return self.deserialize_basic(attr, "str") - obj_type = type(attr) - if obj_type in self.basic_types: - return self.deserialize_basic(attr, self.basic_types[obj_type]) - if obj_type is _long_type: - return self.deserialize_long(attr) - - if obj_type == dict: - deserialized = {} - for key, value in attr.items(): - try: - deserialized[key] = self.deserialize_object(value, **kwargs) - except ValueError: - deserialized[key] = None - return deserialized - - if obj_type == list: - deserialized = [] - for obj in attr: - try: - deserialized.append(self.deserialize_object(obj, **kwargs)) - except ValueError: - pass - return deserialized - - error = "Cannot deserialize generic object with type: " - raise TypeError(error + str(obj_type)) - - def deserialize_basic(self, attr, data_type): # pylint: disable=too-many-return-statements - """Deserialize basic builtin data type from string. - Will attempt to convert to str, int, float and bool. - This function will also accept '1', '0', 'true' and 'false' as - valid bool values. - - :param str attr: response string to be deserialized. - :param str data_type: deserialization data type. - :return: Deserialized basic type. - :rtype: str, int, float or bool - :raises TypeError: if string format is not valid. - """ - # If we're here, data is supposed to be a basic type. - # If it's still an XML node, take the text - if isinstance(attr, ET.Element): - attr = attr.text - if not attr: - if data_type == "str": - # None or '', node is empty string. - return "" - # None or '', node with a strong type is None. - # Don't try to model "empty bool" or "empty int" - return None - - if data_type == "bool": - if attr in [True, False, 1, 0]: - return bool(attr) - if isinstance(attr, str): - if attr.lower() in ["true", "1"]: - return True - if attr.lower() in ["false", "0"]: - return False - raise TypeError("Invalid boolean value: {}".format(attr)) - - if data_type == "str": - return self.deserialize_unicode(attr) - return eval(data_type)(attr) # nosec # pylint: disable=eval-used - - @staticmethod - def deserialize_unicode(data): - """Preserve unicode objects in Python 2, otherwise return data - as a string. - - :param str data: response string to be deserialized. - :return: Deserialized string. - :rtype: str or unicode - """ - # We might be here because we have an enum modeled as string, - # and we try to deserialize a partial dict with enum inside - if isinstance(data, Enum): - return data - - # Consider this is real string - try: - if isinstance(data, unicode): # type: ignore - return data - except NameError: - return str(data) - return str(data) - - @staticmethod - def deserialize_enum(data, enum_obj): - """Deserialize string into enum object. - - If the string is not a valid enum value it will be returned as-is - and a warning will be logged. - - :param str data: Response string to be deserialized. If this value is - None or invalid it will be returned as-is. - :param Enum enum_obj: Enum object to deserialize to. - :return: Deserialized enum object. - :rtype: Enum - """ - if isinstance(data, enum_obj) or data is None: - return data - if isinstance(data, Enum): - data = data.value - if isinstance(data, int): - # Workaround. We might consider remove it in the future. - try: - return list(enum_obj.__members__.values())[data] - except IndexError as exc: - error = "{!r} is not a valid index for enum {!r}" - raise DeserializationError(error.format(data, enum_obj)) from exc - try: - return enum_obj(str(data)) - except ValueError: - for enum_value in enum_obj: - if enum_value.value.lower() == str(data).lower(): - return enum_value - # We don't fail anymore for unknown value, we deserialize as a string - _LOGGER.warning("Deserializer is not able to find %s as valid enum in %s", data, enum_obj) - return Deserializer.deserialize_unicode(data) - - @staticmethod - def deserialize_bytearray(attr): - """Deserialize string into bytearray. - - :param str attr: response string to be deserialized. - :return: Deserialized bytearray - :rtype: bytearray - :raises TypeError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - return bytearray(b64decode(attr)) # type: ignore - - @staticmethod - def deserialize_base64(attr): - """Deserialize base64 encoded string into string. - - :param str attr: response string to be deserialized. - :return: Deserialized base64 string - :rtype: bytearray - :raises TypeError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - padding = "=" * (3 - (len(attr) + 3) % 4) # type: ignore - attr = attr + padding # type: ignore - encoded = attr.replace("-", "+").replace("_", "/") - return b64decode(encoded) - - @staticmethod - def deserialize_decimal(attr): - """Deserialize string into Decimal object. - - :param str attr: response string to be deserialized. - :return: Deserialized decimal - :raises DeserializationError: if string format invalid. - :rtype: decimal - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - return decimal.Decimal(str(attr)) # type: ignore - except decimal.DecimalException as err: - msg = "Invalid decimal {}".format(attr) - raise DeserializationError(msg) from err - - @staticmethod - def deserialize_long(attr): - """Deserialize string into long (Py2) or int (Py3). - - :param str attr: response string to be deserialized. - :return: Deserialized int - :rtype: long or int - :raises ValueError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - return _long_type(attr) # type: ignore - - @staticmethod - def deserialize_duration(attr): - """Deserialize ISO-8601 formatted string into TimeDelta object. - - :param str attr: response string to be deserialized. - :return: Deserialized duration - :rtype: TimeDelta - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - duration = isodate.parse_duration(attr) - except (ValueError, OverflowError, AttributeError) as err: - msg = "Cannot deserialize duration object." - raise DeserializationError(msg) from err - return duration - - @staticmethod - def deserialize_date(attr): - """Deserialize ISO-8601 formatted string into Date object. - - :param str attr: response string to be deserialized. - :return: Deserialized date - :rtype: Date - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore - raise DeserializationError("Date must have only digits and -. Received: %s" % attr) - # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. - return isodate.parse_date(attr, defaultmonth=0, defaultday=0) - - @staticmethod - def deserialize_time(attr): - """Deserialize ISO-8601 formatted string into time object. - - :param str attr: response string to be deserialized. - :return: Deserialized time - :rtype: datetime.time - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - if re.search(r"[^\W\d_]", attr, re.I + re.U): # type: ignore - raise DeserializationError("Date must have only digits and -. Received: %s" % attr) - return isodate.parse_time(attr) - - @staticmethod - def deserialize_rfc(attr): - """Deserialize RFC-1123 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :return: Deserialized RFC datetime - :rtype: Datetime - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - parsed_date = email.utils.parsedate_tz(attr) # type: ignore - date_obj = datetime.datetime( - *parsed_date[:6], tzinfo=datetime.timezone(datetime.timedelta(minutes=(parsed_date[9] or 0) / 60)) - ) - if not date_obj.tzinfo: - date_obj = date_obj.astimezone(tz=TZ_UTC) - except ValueError as err: - msg = "Cannot deserialize to rfc datetime object." - raise DeserializationError(msg) from err - return date_obj - - @staticmethod - def deserialize_iso(attr): - """Deserialize ISO-8601 formatted string into Datetime object. - - :param str attr: response string to be deserialized. - :return: Deserialized ISO datetime - :rtype: Datetime - :raises DeserializationError: if string format invalid. - """ - if isinstance(attr, ET.Element): - attr = attr.text - try: - attr = attr.upper() # type: ignore - match = Deserializer.valid_date.match(attr) - if not match: - raise ValueError("Invalid datetime string: " + attr) - - check_decimal = attr.split(".") - if len(check_decimal) > 1: - decimal_str = "" - for digit in check_decimal[1]: - if digit.isdigit(): - decimal_str += digit - else: - break - if len(decimal_str) > 6: - attr = attr.replace(decimal_str, decimal_str[0:6]) - - date_obj = isodate.parse_datetime(attr) - test_utc = date_obj.utctimetuple() - if test_utc.tm_year > 9999 or test_utc.tm_year < 1: - raise OverflowError("Hit max or min date") - except (ValueError, OverflowError, AttributeError) as err: - msg = "Cannot deserialize datetime object." - raise DeserializationError(msg) from err - return date_obj - - @staticmethod - def deserialize_unix(attr): - """Serialize Datetime object into IntTime format. - This is represented as seconds. - - :param int attr: Object to be serialized. - :return: Deserialized datetime - :rtype: Datetime - :raises DeserializationError: if format invalid - """ - if isinstance(attr, ET.Element): - attr = int(attr.text) # type: ignore - try: - attr = int(attr) - date_obj = datetime.datetime.fromtimestamp(attr, TZ_UTC) - except ValueError as err: - msg = "Cannot deserialize to unix datetime object." - raise DeserializationError(msg) from err - return date_obj diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_version.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_version.py deleted file mode 100644 index be71c81bd28..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/_version.py +++ /dev/null @@ -1,9 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -VERSION = "1.0.0b1" diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/__init__.py deleted file mode 100644 index 4e89685076c..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._client import UnionClient # type: ignore - -try: - from ._patch import __all__ as _patch_all - from ._patch import * -except ImportError: - _patch_all = [] -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "UnionClient", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore - -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_client.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_client.py deleted file mode 100644 index 1b43016396f..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_client.py +++ /dev/null @@ -1,139 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from copy import deepcopy -from typing import Any, Awaitable -from typing_extensions import Self - -from azure.core import AsyncPipelineClient -from azure.core.pipeline import policies -from azure.core.rest import AsyncHttpResponse, HttpRequest - -from .._utils.serialization import Deserializer, Serializer -from ._configuration import UnionClientConfiguration -from .operations import ( - EnumsOnlyOperations, - FloatsOnlyOperations, - IntsOnlyOperations, - MixedLiteralsOperations, - MixedTypesOperations, - ModelsOnlyOperations, - StringAndArrayOperations, - StringExtensibleNamedOperations, - StringExtensibleOperations, - StringsOnlyOperations, -) - - -class UnionClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes - """Describe scenarios for various combinations of unions. - - :ivar strings_only: StringsOnlyOperations operations - :vartype strings_only: typetest.union.aio.operations.StringsOnlyOperations - :ivar string_extensible: StringExtensibleOperations operations - :vartype string_extensible: typetest.union.aio.operations.StringExtensibleOperations - :ivar string_extensible_named: StringExtensibleNamedOperations operations - :vartype string_extensible_named: typetest.union.aio.operations.StringExtensibleNamedOperations - :ivar ints_only: IntsOnlyOperations operations - :vartype ints_only: typetest.union.aio.operations.IntsOnlyOperations - :ivar floats_only: FloatsOnlyOperations operations - :vartype floats_only: typetest.union.aio.operations.FloatsOnlyOperations - :ivar models_only: ModelsOnlyOperations operations - :vartype models_only: typetest.union.aio.operations.ModelsOnlyOperations - :ivar enums_only: EnumsOnlyOperations operations - :vartype enums_only: typetest.union.aio.operations.EnumsOnlyOperations - :ivar string_and_array: StringAndArrayOperations operations - :vartype string_and_array: typetest.union.aio.operations.StringAndArrayOperations - :ivar mixed_literals: MixedLiteralsOperations operations - :vartype mixed_literals: typetest.union.aio.operations.MixedLiteralsOperations - :ivar mixed_types: MixedTypesOperations operations - :vartype mixed_types: typetest.union.aio.operations.MixedTypesOperations - :keyword endpoint: Service host. Default value is "http://localhost:3000". - :paramtype endpoint: str - """ - - def __init__( # pylint: disable=missing-client-constructor-parameter-credential - self, *, endpoint: str = "http://localhost:3000", **kwargs: Any - ) -> None: - _endpoint = "{endpoint}" - self._config = UnionClientConfiguration(endpoint=endpoint, **kwargs) - - _policies = kwargs.pop("policies", None) - if _policies is None: - _policies = [ - policies.RequestIdPolicy(**kwargs), - self._config.headers_policy, - self._config.user_agent_policy, - self._config.proxy_policy, - policies.ContentDecodePolicy(**kwargs), - self._config.redirect_policy, - self._config.retry_policy, - self._config.authentication_policy, - self._config.custom_hook_policy, - self._config.logging_policy, - policies.DistributedTracingPolicy(**kwargs), - policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None, - self._config.http_logging_policy, - ] - self._client: AsyncPipelineClient = AsyncPipelineClient(base_url=_endpoint, policies=_policies, **kwargs) - - self._serialize = Serializer() - self._deserialize = Deserializer() - self._serialize.client_side_validation = False - self.strings_only = StringsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.string_extensible = StringExtensibleOperations( - self._client, self._config, self._serialize, self._deserialize - ) - self.string_extensible_named = StringExtensibleNamedOperations( - self._client, self._config, self._serialize, self._deserialize - ) - self.ints_only = IntsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.floats_only = FloatsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.models_only = ModelsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.enums_only = EnumsOnlyOperations(self._client, self._config, self._serialize, self._deserialize) - self.string_and_array = StringAndArrayOperations(self._client, self._config, self._serialize, self._deserialize) - self.mixed_literals = MixedLiteralsOperations(self._client, self._config, self._serialize, self._deserialize) - self.mixed_types = MixedTypesOperations(self._client, self._config, self._serialize, self._deserialize) - - def send_request( - self, request: HttpRequest, *, stream: bool = False, **kwargs: Any - ) -> Awaitable[AsyncHttpResponse]: - """Runs the network request through the client's chained policies. - - >>> from azure.core.rest import HttpRequest - >>> request = HttpRequest("GET", "https://www.example.org/") - - >>> response = await client.send_request(request) - - - For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request - - :param request: The network request you want to make. Required. - :type request: ~azure.core.rest.HttpRequest - :keyword bool stream: Whether the response payload will be streamed. Defaults to False. - :return: The response of your network call. Does not do error handling on your response. - :rtype: ~azure.core.rest.AsyncHttpResponse - """ - - request_copy = deepcopy(request) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - - request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments) - return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore - - async def close(self) -> None: - await self._client.close() - - async def __aenter__(self) -> Self: - await self._client.__aenter__() - return self - - async def __aexit__(self, *exc_details: Any) -> None: - await self._client.__aexit__(*exc_details) diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_configuration.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_configuration.py deleted file mode 100644 index 7eb55f17196..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_configuration.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from typing import Any - -from azure.core.pipeline import policies - -from .._version import VERSION - - -class UnionClientConfiguration: # pylint: disable=too-many-instance-attributes - """Configuration for UnionClient. - - Note that all parameters used to create this instance are saved as instance - attributes. - - :param endpoint: Service host. Default value is "http://localhost:3000". - :type endpoint: str - """ - - def __init__(self, endpoint: str = "http://localhost:3000", **kwargs: Any) -> None: - - self.endpoint = endpoint - kwargs.setdefault("sdk_moniker", "typetest-union/{}".format(VERSION)) - self.polling_interval = kwargs.get("polling_interval", 30) - self._configure(**kwargs) - - def _configure(self, **kwargs: Any) -> None: - self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs) - self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs) - self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs) - self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs) - self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs) - self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs) - self.redirect_policy = kwargs.get("redirect_policy") or policies.AsyncRedirectPolicy(**kwargs) - self.retry_policy = kwargs.get("retry_policy") or policies.AsyncRetryPolicy(**kwargs) - self.authentication_policy = kwargs.get("authentication_policy") diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_patch.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/__init__.py deleted file mode 100644 index 79b9ff621f3..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._operations import StringsOnlyOperations # type: ignore -from ._operations import StringExtensibleOperations # type: ignore -from ._operations import StringExtensibleNamedOperations # type: ignore -from ._operations import IntsOnlyOperations # type: ignore -from ._operations import FloatsOnlyOperations # type: ignore -from ._operations import ModelsOnlyOperations # type: ignore -from ._operations import EnumsOnlyOperations # type: ignore -from ._operations import StringAndArrayOperations # type: ignore -from ._operations import MixedLiteralsOperations # type: ignore -from ._operations import MixedTypesOperations # type: ignore - -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "StringsOnlyOperations", - "StringExtensibleOperations", - "StringExtensibleNamedOperations", - "IntsOnlyOperations", - "FloatsOnlyOperations", - "ModelsOnlyOperations", - "EnumsOnlyOperations", - "StringAndArrayOperations", - "MixedLiteralsOperations", - "MixedTypesOperations", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_operations.py deleted file mode 100644 index 6313b30f4bc..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_operations.py +++ /dev/null @@ -1,1898 +0,0 @@ -# pylint: disable=too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from collections.abc import MutableMapping -from io import IOBase -import json -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload - -from azure.core import AsyncPipelineClient -from azure.core.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - StreamClosedError, - StreamConsumedError, - map_error, -) -from azure.core.pipeline import PipelineResponse -from azure.core.rest import AsyncHttpResponse, HttpRequest -from azure.core.tracing.decorator_async import distributed_trace_async -from azure.core.utils import case_insensitive_dict - -from ... import models as _models -from ..._utils.model_base import SdkJSONEncoder, _deserialize -from ..._utils.serialization import Deserializer, Serializer -from ...operations._operations import ( - build_enums_only_get_request, - build_enums_only_send_request, - build_floats_only_get_request, - build_floats_only_send_request, - build_ints_only_get_request, - build_ints_only_send_request, - build_mixed_literals_get_request, - build_mixed_literals_send_request, - build_mixed_types_get_request, - build_mixed_types_send_request, - build_models_only_get_request, - build_models_only_send_request, - build_string_and_array_get_request, - build_string_and_array_send_request, - build_string_extensible_get_request, - build_string_extensible_named_get_request, - build_string_extensible_named_send_request, - build_string_extensible_send_request, - build_strings_only_get_request, - build_strings_only_send_request, -) -from .._configuration import UnionClientConfiguration - -JSON = MutableMapping[str, Any] -_Unset: Any = object() -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] - - -class StringsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`strings_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse: - """get. - - :return: GetResponse. The GetResponse is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse] = kwargs.pop("cls", None) - - _request = build_strings_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: Literal["a", "b", "c"], content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Is one of the following types: Literal["a"], Literal["b"], Literal["c"] - Required. - :paramtype prop: str or str or str - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: Literal["a", "b", "c"] = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: Literal["a"], Literal["b"], Literal["c"] - Required. - :paramtype prop: str or str or str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_strings_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class StringExtensibleOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`string_extensible` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse1: - """get. - - :return: GetResponse1. The GetResponse1 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse1 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse1] = kwargs.pop("cls", None) - - _request = build_string_extensible_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse1, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: Union[Literal["b"], Literal["c"], str], content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Is one of the following types: Literal["b"], Literal["c"], str Required. - :paramtype prop: str or str or str - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, - body: Union[JSON, IO[bytes]] = _Unset, - *, - prop: Union[Literal["b"], Literal["c"], str] = _Unset, - **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: Literal["b"], Literal["c"], str Required. - :paramtype prop: str or str or str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_string_extensible_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class StringExtensibleNamedOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`string_extensible_named` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse2: - """get. - - :return: GetResponse2. The GetResponse2 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse2 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse2] = kwargs.pop("cls", None) - - _request = build_string_extensible_named_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse2, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, - *, - prop: Union[str, _models.StringExtensibleNamedUnion], - content_type: str = "application/json", - **kwargs: Any - ) -> None: - """send. - - :keyword prop: Known values are: "b" and "c". Required. - :paramtype prop: str or ~typetest.union.models.StringExtensibleNamedUnion - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, - body: Union[JSON, IO[bytes]] = _Unset, - *, - prop: Union[str, _models.StringExtensibleNamedUnion] = _Unset, - **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Known values are: "b" and "c". Required. - :paramtype prop: str or ~typetest.union.models.StringExtensibleNamedUnion - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_string_extensible_named_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class IntsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`ints_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse3: - """get. - - :return: GetResponse3. The GetResponse3 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse3 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse3] = kwargs.pop("cls", None) - - _request = build_ints_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse3, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send(self, *, prop: Literal[1, 2, 3], content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Is one of the following types: Literal[1], Literal[2], Literal[3] Required. - :paramtype prop: int or int or int - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: Literal[1, 2, 3] = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: Literal[1], Literal[2], Literal[3] Required. - :paramtype prop: int or int or int - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_ints_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class FloatsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`floats_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse4: - """get. - - :return: GetResponse4. The GetResponse4 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse4 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse4] = kwargs.pop("cls", None) - - _request = build_floats_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse4, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send(self, *, prop: float, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Is one of the following types: float Required. - :paramtype prop: float or float or float - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send(self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: float = _Unset, **kwargs: Any) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: float Required. - :paramtype prop: float or float or float - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_floats_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class ModelsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`models_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse5: - """get. - - :return: GetResponse5. The GetResponse5 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse5 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse5] = kwargs.pop("cls", None) - - _request = build_models_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse5, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: Union[_models.Cat, _models.Dog], content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Is either a Cat type or a Dog type. Required. - :paramtype prop: ~typetest.union.models.Cat or ~typetest.union.models.Dog - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: Union[_models.Cat, _models.Dog] = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is either a Cat type or a Dog type. Required. - :paramtype prop: ~typetest.union.models.Cat or ~typetest.union.models.Dog - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_models_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class EnumsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`enums_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse6: - """get. - - :return: GetResponse6. The GetResponse6 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse6 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse6] = kwargs.pop("cls", None) - - _request = build_enums_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse6, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: _models.EnumsOnlyCases, content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.EnumsOnlyCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.EnumsOnlyCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.EnumsOnlyCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_enums_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class StringAndArrayOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`string_and_array` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse7: - """get. - - :return: GetResponse7. The GetResponse7 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse7 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse7] = kwargs.pop("cls", None) - - _request = build_string_and_array_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse7, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: _models.StringAndArrayCases, content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.StringAndArrayCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.StringAndArrayCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.StringAndArrayCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_string_and_array_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class MixedLiteralsOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`mixed_literals` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse8: - """get. - - :return: GetResponse8. The GetResponse8 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse8 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse8] = kwargs.pop("cls", None) - - _request = build_mixed_literals_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse8, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: _models.MixedLiteralsCases, content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedLiteralsCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.MixedLiteralsCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedLiteralsCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_mixed_literals_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class MixedTypesOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.aio.UnionClient`'s - :attr:`mixed_types` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: AsyncPipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace_async - async def get(self, **kwargs: Any) -> _models.GetResponse9: - """get. - - :return: GetResponse9. The GetResponse9 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse9 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse9] = kwargs.pop("cls", None) - - _request = build_mixed_types_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - await response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse9, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - async def send( - self, *, prop: _models.MixedTypesCases, content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedTypesCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - async def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace_async - async def send( - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.MixedTypesCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedTypesCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_mixed_types_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_patch.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/aio/operations/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/__init__.py deleted file mode 100644 index 7d46e43ec75..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/__init__.py +++ /dev/null @@ -1,62 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - - -from ._models import ( # type: ignore - Cat, - Dog, - EnumsOnlyCases, - GetResponse, - GetResponse1, - GetResponse2, - GetResponse3, - GetResponse4, - GetResponse5, - GetResponse6, - GetResponse7, - GetResponse8, - GetResponse9, - MixedLiteralsCases, - MixedTypesCases, - StringAndArrayCases, -) - -from ._enums import ( # type: ignore - StringExtensibleNamedUnion, -) -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "Cat", - "Dog", - "EnumsOnlyCases", - "GetResponse", - "GetResponse1", - "GetResponse2", - "GetResponse3", - "GetResponse4", - "GetResponse5", - "GetResponse6", - "GetResponse7", - "GetResponse8", - "GetResponse9", - "MixedLiteralsCases", - "MixedTypesCases", - "StringAndArrayCases", - "StringExtensibleNamedUnion", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_enums.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_enums.py deleted file mode 100644 index 8057e6b79bd..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_enums.py +++ /dev/null @@ -1,17 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- - -from enum import Enum -from azure.core import CaseInsensitiveEnumMeta - - -class StringExtensibleNamedUnion(str, Enum, metaclass=CaseInsensitiveEnumMeta): - """Type of StringExtensibleNamedUnion.""" - - OPTION_B = "b" - C = "c" diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py deleted file mode 100644 index a9bdc5878bd..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_models.py +++ /dev/null @@ -1,552 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=useless-super-delegation - -from typing import Any, List, Literal, Mapping, TYPE_CHECKING, Union, overload - -from .._utils.model_base import Model as _Model, rest_field - -if TYPE_CHECKING: - from .. import models as _models - - -class Cat(_Model): - """Cat. - - :ivar name: Required. - :vartype name: str - """ - - name: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - name: str, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class Dog(_Model): - """Dog. - - :ivar bark: Required. - :vartype bark: str - """ - - bark: str = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - bark: str, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class EnumsOnlyCases(_Model): - """EnumsOnlyCases. - - :ivar lr: This should be receive/send the left variant. Required. Is one of the following - types: Literal["left"], Literal["right"], Literal["up"], Literal["down"] - :vartype lr: str or str or str or str - :ivar ud: This should be receive/send the up variant. Required. Is either a Literal["up"] type - or a Literal["down"] type. - :vartype ud: str or str - """ - - lr: Literal["left", "right", "up", "down"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """This should be receive/send the left variant. Required. Is one of the following types: - Literal[\"left\"], Literal[\"right\"], Literal[\"up\"], Literal[\"down\"]""" - ud: Literal["up", "down"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """This should be receive/send the up variant. Required. Is either a Literal[\"up\"] type or a - Literal[\"down\"] type.""" - - @overload - def __init__( - self, - *, - lr: Literal["left", "right", "up", "down"], - ud: Literal["up", "down"], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse(_Model): - """GetResponse. - - :ivar prop: Required. Is one of the following types: Literal["a"], Literal["b"], Literal["c"] - :vartype prop: str or str or str - """ - - prop: Literal["a", "b", "c"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required. Is one of the following types: Literal[\"a\"], Literal[\"b\"], Literal[\"c\"]""" - - @overload - def __init__( - self, - *, - prop: Literal["a", "b", "c"], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse1(_Model): - """GetResponse1. - - :ivar prop: Required. Is one of the following types: Literal["b"], Literal["c"], str - :vartype prop: str or str or str - """ - - prop: Union[Literal["b"], Literal["c"], str] = rest_field( - visibility=["read", "create", "update", "delete", "query"] - ) - """Required. Is one of the following types: Literal[\"b\"], Literal[\"c\"], str""" - - @overload - def __init__( - self, - *, - prop: Union[Literal["b"], Literal["c"], str], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse2(_Model): - """GetResponse2. - - :ivar prop: Required. Known values are: "b" and "c". - :vartype prop: str or ~typetest.union.models.StringExtensibleNamedUnion - """ - - prop: Union[str, "_models.StringExtensibleNamedUnion"] = rest_field( - visibility=["read", "create", "update", "delete", "query"] - ) - """Required. Known values are: \"b\" and \"c\".""" - - @overload - def __init__( - self, - *, - prop: Union[str, "_models.StringExtensibleNamedUnion"], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse3(_Model): - """GetResponse3. - - :ivar prop: Required. Is one of the following types: Literal[1], Literal[2], Literal[3] - :vartype prop: int or int or int - """ - - prop: Literal[1, 2, 3] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required. Is one of the following types: Literal[1], Literal[2], Literal[3]""" - - @overload - def __init__( - self, - *, - prop: Literal[1, 2, 3], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse4(_Model): - """GetResponse4. - - :ivar prop: Required. Is one of the following types: float - :vartype prop: float or float or float - """ - - prop: float = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required. Is one of the following types: float""" - - @overload - def __init__( - self, - *, - prop: float, - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse5(_Model): - """GetResponse5. - - :ivar prop: Required. Is either a Cat type or a Dog type. - :vartype prop: ~typetest.union.models.Cat or ~typetest.union.models.Dog - """ - - prop: Union["_models.Cat", "_models.Dog"] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required. Is either a Cat type or a Dog type.""" - - @overload - def __init__( - self, - *, - prop: Union["_models.Cat", "_models.Dog"], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse6(_Model): - """GetResponse6. - - :ivar prop: Required. - :vartype prop: ~typetest.union.models.EnumsOnlyCases - """ - - prop: "_models.EnumsOnlyCases" = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - prop: "_models.EnumsOnlyCases", - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse7(_Model): - """GetResponse7. - - :ivar prop: Required. - :vartype prop: ~typetest.union.models.StringAndArrayCases - """ - - prop: "_models.StringAndArrayCases" = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - prop: "_models.StringAndArrayCases", - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse8(_Model): - """GetResponse8. - - :ivar prop: Required. - :vartype prop: ~typetest.union.models.MixedLiteralsCases - """ - - prop: "_models.MixedLiteralsCases" = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - prop: "_models.MixedLiteralsCases", - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class GetResponse9(_Model): - """GetResponse9. - - :ivar prop: Required. - :vartype prop: ~typetest.union.models.MixedTypesCases - """ - - prop: "_models.MixedTypesCases" = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """Required.""" - - @overload - def __init__( - self, - *, - prop: "_models.MixedTypesCases", - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class MixedLiteralsCases(_Model): - """MixedLiteralsCases. - - :ivar string_literal: This should be receive/send the "a" variant. Required. Is one of the - following types: Literal["a"], Literal[2], float, Literal[True] - :vartype string_literal: str or int or float or bool - :ivar int_literal: This should be receive/send the 2 variant. Required. Is one of the following - types: Literal["a"], Literal[2], float, Literal[True] - :vartype int_literal: str or int or float or bool - :ivar float_literal: This should be receive/send the 3.3 variant. Required. Is one of the - following types: Literal["a"], Literal[2], float, Literal[True] - :vartype float_literal: str or int or float or bool - :ivar boolean_literal: This should be receive/send the true variant. Required. Is one of the - following types: Literal["a"], Literal[2], float, Literal[True] - :vartype boolean_literal: str or int or float or bool - """ - - string_literal: Literal["a", 2, True] = rest_field( - name="stringLiteral", visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the \"a\" variant. Required. Is one of the following types: - Literal[\"a\"], Literal[2], float, Literal[True]""" - int_literal: Literal["a", 2, True] = rest_field( - name="intLiteral", visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the 2 variant. Required. Is one of the following types: - Literal[\"a\"], Literal[2], float, Literal[True]""" - float_literal: Literal["a", 2, True] = rest_field( - name="floatLiteral", visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the 3.3 variant. Required. Is one of the following types: - Literal[\"a\"], Literal[2], float, Literal[True]""" - boolean_literal: Literal["a", 2, True] = rest_field( - name="booleanLiteral", visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the true variant. Required. Is one of the following types: - Literal[\"a\"], Literal[2], float, Literal[True]""" - - @overload - def __init__( - self, - *, - string_literal: Literal["a", 2, True], - int_literal: Literal["a", 2, True], - float_literal: Literal["a", 2, True], - boolean_literal: Literal["a", 2, True], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class MixedTypesCases(_Model): - """MixedTypesCases. - - :ivar model: This should be receive/send the Cat variant. Required. Is one of the following - types: Cat, Literal["a"], int, bool - :vartype model: ~typetest.union.models.Cat or str or int or bool - :ivar literal: This should be receive/send the "a" variant. Required. Is one of the following - types: Cat, Literal["a"], int, bool - :vartype literal: ~typetest.union.models.Cat or str or int or bool - :ivar int_property: This should be receive/send the int variant. Required. Is one of the - following types: Cat, Literal["a"], int, bool - :vartype int_property: ~typetest.union.models.Cat or str or int or bool - :ivar boolean: This should be receive/send the boolean variant. Required. Is one of the - following types: Cat, Literal["a"], int, bool - :vartype boolean: ~typetest.union.models.Cat or str or int or bool - :ivar array: This should be receive/send 4 element with Cat, "a", int, and boolean. Required. - :vartype array: list[~typetest.union.models.Cat or str or int or bool] - """ - - model: Union["_models.Cat", Literal["a"], int, bool] = rest_field( - visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the Cat variant. Required. Is one of the following types: Cat, - Literal[\"a\"], int, bool""" - literal: Union["_models.Cat", Literal["a"], int, bool] = rest_field( - visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the \"a\" variant. Required. Is one of the following types: Cat, - Literal[\"a\"], int, bool""" - int_property: Union["_models.Cat", Literal["a"], int, bool] = rest_field( - name="int", visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the int variant. Required. Is one of the following types: Cat, - Literal[\"a\"], int, bool""" - boolean: Union["_models.Cat", Literal["a"], int, bool] = rest_field( - visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send the boolean variant. Required. Is one of the following types: Cat, - Literal[\"a\"], int, bool""" - array: List[Union["_models.Cat", Literal["a"], int, bool]] = rest_field( - visibility=["read", "create", "update", "delete", "query"] - ) - """This should be receive/send 4 element with Cat, \"a\", int, and boolean. Required.""" - - @overload - def __init__( - self, - *, - model: Union["_models.Cat", Literal["a"], int, bool], - literal: Union["_models.Cat", Literal["a"], int, bool], - int_property: Union["_models.Cat", Literal["a"], int, bool], - boolean: Union["_models.Cat", Literal["a"], int, bool], - array: List[Union["_models.Cat", Literal["a"], int, bool]], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) - - -class StringAndArrayCases(_Model): - """StringAndArrayCases. - - :ivar string: This should be receive/send the string variant. Required. Is either a str type or - a [str] type. - :vartype string: str or list[str] - :ivar array: This should be receive/send the array variant. Required. Is either a str type or a - [str] type. - :vartype array: str or list[str] - """ - - string: Union[str, List[str]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """This should be receive/send the string variant. Required. Is either a str type or a [str] type.""" - array: Union[str, List[str]] = rest_field(visibility=["read", "create", "update", "delete", "query"]) - """This should be receive/send the array variant. Required. Is either a str type or a [str] type.""" - - @overload - def __init__( - self, - *, - string: Union[str, List[str]], - array: Union[str, List[str]], - ) -> None: ... - - @overload - def __init__(self, mapping: Mapping[str, Any]) -> None: - """ - :param mapping: raw JSON to initialize the model. - :type mapping: Mapping[str, Any] - """ - - def __init__(self, *args: Any, **kwargs: Any) -> None: - super().__init__(*args, **kwargs) diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_patch.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/models/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/__init__.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/__init__.py deleted file mode 100644 index 79b9ff621f3..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -# pylint: disable=wrong-import-position - -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from ._patch import * # pylint: disable=unused-wildcard-import - -from ._operations import StringsOnlyOperations # type: ignore -from ._operations import StringExtensibleOperations # type: ignore -from ._operations import StringExtensibleNamedOperations # type: ignore -from ._operations import IntsOnlyOperations # type: ignore -from ._operations import FloatsOnlyOperations # type: ignore -from ._operations import ModelsOnlyOperations # type: ignore -from ._operations import EnumsOnlyOperations # type: ignore -from ._operations import StringAndArrayOperations # type: ignore -from ._operations import MixedLiteralsOperations # type: ignore -from ._operations import MixedTypesOperations # type: ignore - -from ._patch import __all__ as _patch_all -from ._patch import * -from ._patch import patch_sdk as _patch_sdk - -__all__ = [ - "StringsOnlyOperations", - "StringExtensibleOperations", - "StringExtensibleNamedOperations", - "IntsOnlyOperations", - "FloatsOnlyOperations", - "ModelsOnlyOperations", - "EnumsOnlyOperations", - "StringAndArrayOperations", - "MixedLiteralsOperations", - "MixedTypesOperations", -] -__all__.extend([p for p in _patch_all if p not in __all__]) # pyright: ignore -_patch_sdk() diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_operations.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_operations.py deleted file mode 100644 index 735eeecb838..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_operations.py +++ /dev/null @@ -1,2151 +0,0 @@ -# pylint: disable=too-many-lines -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# Code generated by Microsoft (R) Python Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is regenerated. -# -------------------------------------------------------------------------- -from collections.abc import MutableMapping -from io import IOBase -import json -from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload - -from azure.core import PipelineClient -from azure.core.exceptions import ( - ClientAuthenticationError, - HttpResponseError, - ResourceExistsError, - ResourceNotFoundError, - ResourceNotModifiedError, - StreamClosedError, - StreamConsumedError, - map_error, -) -from azure.core.pipeline import PipelineResponse -from azure.core.rest import HttpRequest, HttpResponse -from azure.core.tracing.decorator import distributed_trace -from azure.core.utils import case_insensitive_dict - -from .. import models as _models -from .._configuration import UnionClientConfiguration -from .._utils.model_base import SdkJSONEncoder, _deserialize -from .._utils.serialization import Deserializer, Serializer - -JSON = MutableMapping[str, Any] -_Unset: Any = object() -T = TypeVar("T") -ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] - -_SERIALIZER = Serializer() -_SERIALIZER.client_side_validation = False - - -def build_strings_only_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/strings-only" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_strings_only_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/strings-only" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_string_extensible_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/string-extensible" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_string_extensible_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/string-extensible" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_string_extensible_named_get_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/string-extensible-named" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_string_extensible_named_send_request(**kwargs: Any) -> HttpRequest: # pylint: disable=name-too-long - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/string-extensible-named" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_ints_only_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/ints-only" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_ints_only_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/ints-only" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_floats_only_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/floats-only" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_floats_only_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/floats-only" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_models_only_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/models-only" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_models_only_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/models-only" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_enums_only_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/enums-only" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_enums_only_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/enums-only" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_string_and_array_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/string-and-array" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_string_and_array_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/string-and-array" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_mixed_literals_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/mixed-literals" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_mixed_literals_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/mixed-literals" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -def build_mixed_types_get_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - accept = _headers.pop("Accept", "application/json") - - # Construct URL - _url = "/type/union/mixed-types" - - # Construct headers - _headers["Accept"] = _SERIALIZER.header("accept", accept, "str") - - return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs) - - -def build_mixed_types_send_request(**kwargs: Any) -> HttpRequest: - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - # Construct URL - _url = "/type/union/mixed-types" - - # Construct headers - if content_type is not None: - _headers["Content-Type"] = _SERIALIZER.header("content_type", content_type, "str") - - return HttpRequest(method="POST", url=_url, headers=_headers, **kwargs) - - -class StringsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`strings_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse: - """get. - - :return: GetResponse. The GetResponse is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse] = kwargs.pop("cls", None) - - _request = build_strings_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: Literal["a", "b", "c"], content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Is one of the following types: Literal["a"], Literal["b"], Literal["c"] - Required. - :paramtype prop: str or str or str - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: Literal["a", "b", "c"] = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: Literal["a"], Literal["b"], Literal["c"] - Required. - :paramtype prop: str or str or str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_strings_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class StringExtensibleOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`string_extensible` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse1: - """get. - - :return: GetResponse1. The GetResponse1 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse1 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse1] = kwargs.pop("cls", None) - - _request = build_string_extensible_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse1, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send( - self, *, prop: Union[Literal["b"], Literal["c"], str], content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Is one of the following types: Literal["b"], Literal["c"], str Required. - :paramtype prop: str or str or str - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, - body: Union[JSON, IO[bytes]] = _Unset, - *, - prop: Union[Literal["b"], Literal["c"], str] = _Unset, - **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: Literal["b"], Literal["c"], str Required. - :paramtype prop: str or str or str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_string_extensible_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class StringExtensibleNamedOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`string_extensible_named` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse2: - """get. - - :return: GetResponse2. The GetResponse2 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse2 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse2] = kwargs.pop("cls", None) - - _request = build_string_extensible_named_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse2, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send( - self, - *, - prop: Union[str, _models.StringExtensibleNamedUnion], - content_type: str = "application/json", - **kwargs: Any - ) -> None: - """send. - - :keyword prop: Known values are: "b" and "c". Required. - :paramtype prop: str or ~typetest.union.models.StringExtensibleNamedUnion - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, - body: Union[JSON, IO[bytes]] = _Unset, - *, - prop: Union[str, _models.StringExtensibleNamedUnion] = _Unset, - **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Known values are: "b" and "c". Required. - :paramtype prop: str or ~typetest.union.models.StringExtensibleNamedUnion - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_string_extensible_named_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class IntsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`ints_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse3: - """get. - - :return: GetResponse3. The GetResponse3 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse3 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse3] = kwargs.pop("cls", None) - - _request = build_ints_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse3, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: Literal[1, 2, 3], content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Is one of the following types: Literal[1], Literal[2], Literal[3] Required. - :paramtype prop: int or int or int - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: Literal[1, 2, 3] = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: Literal[1], Literal[2], Literal[3] Required. - :paramtype prop: int or int or int - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_ints_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class FloatsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`floats_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse4: - """get. - - :return: GetResponse4. The GetResponse4 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse4 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse4] = kwargs.pop("cls", None) - - _request = build_floats_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse4, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: float, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Is one of the following types: float Required. - :paramtype prop: float or float or float - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: float = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is one of the following types: float Required. - :paramtype prop: float or float or float - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_floats_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class ModelsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`models_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse5: - """get. - - :return: GetResponse5. The GetResponse5 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse5 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse5] = kwargs.pop("cls", None) - - _request = build_models_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse5, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send( - self, *, prop: Union[_models.Cat, _models.Dog], content_type: str = "application/json", **kwargs: Any - ) -> None: - """send. - - :keyword prop: Is either a Cat type or a Dog type. Required. - :paramtype prop: ~typetest.union.models.Cat or ~typetest.union.models.Dog - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: Union[_models.Cat, _models.Dog] = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Is either a Cat type or a Dog type. Required. - :paramtype prop: ~typetest.union.models.Cat or ~typetest.union.models.Dog - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_models_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class EnumsOnlyOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`enums_only` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse6: - """get. - - :return: GetResponse6. The GetResponse6 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse6 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse6] = kwargs.pop("cls", None) - - _request = build_enums_only_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse6, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: _models.EnumsOnlyCases, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.EnumsOnlyCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.EnumsOnlyCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.EnumsOnlyCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_enums_only_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class StringAndArrayOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`string_and_array` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse7: - """get. - - :return: GetResponse7. The GetResponse7 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse7 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse7] = kwargs.pop("cls", None) - - _request = build_string_and_array_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse7, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: _models.StringAndArrayCases, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.StringAndArrayCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.StringAndArrayCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.StringAndArrayCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_string_and_array_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class MixedLiteralsOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`mixed_literals` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse8: - """get. - - :return: GetResponse8. The GetResponse8 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse8 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse8] = kwargs.pop("cls", None) - - _request = build_mixed_literals_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse8, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: _models.MixedLiteralsCases, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedLiteralsCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.MixedLiteralsCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedLiteralsCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_mixed_literals_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore - - -class MixedTypesOperations: - """ - .. warning:: - **DO NOT** instantiate this class directly. - - Instead, you should access the following operations through - :class:`~typetest.union.UnionClient`'s - :attr:`mixed_types` attribute. - """ - - def __init__(self, *args, **kwargs) -> None: - input_args = list(args) - self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client") - self._config: UnionClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config") - self._serialize: Serializer = input_args.pop(0) if input_args else kwargs.pop("serializer") - self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer") - - @distributed_trace - def get(self, **kwargs: Any) -> _models.GetResponse9: - """get. - - :return: GetResponse9. The GetResponse9 is compatible with MutableMapping - :rtype: ~typetest.union.models.GetResponse9 - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = kwargs.pop("headers", {}) or {} - _params = kwargs.pop("params", {}) or {} - - cls: ClsType[_models.GetResponse9] = kwargs.pop("cls", None) - - _request = build_mixed_types_get_request( - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = kwargs.pop("stream", False) - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [200]: - if _stream: - try: - response.read() # Load the body in memory and close the socket - except (StreamConsumedError, StreamClosedError): - pass - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if _stream: - deserialized = response.iter_bytes() - else: - deserialized = _deserialize(_models.GetResponse9, response.json()) - - if cls: - return cls(pipeline_response, deserialized, {}) # type: ignore - - return deserialized # type: ignore - - @overload - def send(self, *, prop: _models.MixedTypesCases, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedTypesCases - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: JSON, *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: JSON - :keyword content_type: Body Parameter content-type. Content type parameter for JSON body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @overload - def send(self, body: IO[bytes], *, content_type: str = "application/json", **kwargs: Any) -> None: - """send. - - :param body: Required. - :type body: IO[bytes] - :keyword content_type: Body Parameter content-type. Content type parameter for binary body. - Default value is "application/json". - :paramtype content_type: str - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - - @distributed_trace - def send( # pylint: disable=inconsistent-return-statements - self, body: Union[JSON, IO[bytes]] = _Unset, *, prop: _models.MixedTypesCases = _Unset, **kwargs: Any - ) -> None: - """send. - - :param body: Is either a JSON type or a IO[bytes] type. Required. - :type body: JSON or IO[bytes] - :keyword prop: Required. - :paramtype prop: ~typetest.union.models.MixedTypesCases - :return: None - :rtype: None - :raises ~azure.core.exceptions.HttpResponseError: - """ - error_map: MutableMapping = { - 401: ClientAuthenticationError, - 404: ResourceNotFoundError, - 409: ResourceExistsError, - 304: ResourceNotModifiedError, - } - error_map.update(kwargs.pop("error_map", {}) or {}) - - _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) - _params = kwargs.pop("params", {}) or {} - - content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) - cls: ClsType[None] = kwargs.pop("cls", None) - - if body is _Unset: - if prop is _Unset: - raise TypeError("missing required argument: prop") - body = {"prop": prop} - body = {k: v for k, v in body.items() if v is not None} - content_type = content_type or "application/json" - _content = None - if isinstance(body, (IOBase, bytes)): - _content = body - else: - _content = json.dumps(body, cls=SdkJSONEncoder, exclude_readonly=True) # type: ignore - - _request = build_mixed_types_send_request( - content_type=content_type, - content=_content, - headers=_headers, - params=_params, - ) - path_format_arguments = { - "endpoint": self._serialize.url("self._config.endpoint", self._config.endpoint, "str", skip_quote=True), - } - _request.url = self._client.format_url(_request.url, **path_format_arguments) - - _stream = False - pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access - _request, stream=_stream, **kwargs - ) - - response = pipeline_response.http_response - - if response.status_code not in [204]: - map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response) - - if cls: - return cls(pipeline_response, None, {}) # type: ignore diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_patch.py b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_patch.py deleted file mode 100644 index 8bcb627aa47..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/operations/_patch.py +++ /dev/null @@ -1,21 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for license information. -# -------------------------------------------------------------------------- -"""Customize generated code here. - -Follow our quickstart for examples: https://aka.ms/azsdk/python/dpcodegen/python/customize -""" -from typing import List - -__all__: List[str] = [] # Add all objects you want publicly available to users at this package level - - -def patch_sdk(): - """Do not remove from this file. - - `patch_sdk` is a last resort escape hatch that allows you to do customizations - you can't accomplish using the techniques described in - https://aka.ms/azsdk/python/dpcodegen/python/customize - """ diff --git a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/py.typed b/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/py.typed deleted file mode 100644 index e5aff4f83af..00000000000 --- a/packages/typespec-python/test/azure/generated/typetest-union/typetest/union/py.typed +++ /dev/null @@ -1 +0,0 @@ -# Marker file for PEP 561. \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 008b26483e7..f4929945a15 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,8 +60,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: ~0.15.0 - version: 0.15.0(iurth4uuk4s6znzuuc7ncenk2q) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -82,8 +82,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: ~0.15.0 - version: 0.15.0(iurth4uuk4s6znzuuc7ncenk2q) + specifier: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz + version: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz(iurth4uuk4s6znzuuc7ncenk2q) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1668,8 +1668,9 @@ packages: peerDependencies: '@typespec/compiler': ^1.2.1 - '@typespec/http-client-python@0.15.0': - resolution: {integrity: sha512-lnyg7bgzxdILhUV+HJGbKuRDphZipe7jJYfvFoklq0eapAFmgwf4gp/XMnnrFLs/++3QZ9QFVIyuqzMPW8yG+Q==} + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz': + resolution: {tarball: https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz} + version: 0.15.0 engines: {node: '>=20.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.58.0 <1.0.0' @@ -6421,7 +6422,7 @@ snapshots: dependencies: '@typespec/compiler': 1.2.1(@types/node@22.13.17) - '@typespec/http-client-python@0.15.0(iurth4uuk4s6znzuuc7ncenk2q)': + '@typespec/http-client-python@https://artprodcus3.artifacts.visualstudio.com/A0fb41ef4-5012-48a9-bf39-4ee3de03ee35/29ec6040-b234-4e31-b139-33dc4287b756/_apis/artifact/cGlwZWxpbmVhcnRpZmFjdDovL2F6dXJlLXNkay9wcm9qZWN0SWQvMjllYzYwNDAtYjIzNC00ZTMxLWIxMzktMzNkYzQyODdiNzU2L2J1aWxkSWQvNTE4ODEzMi9hcnRpZmFjdE5hbWUvYnVpbGRfYXJ0aWZhY3RzX3B5dGhvbg2/content?format=file&subPath=%2Fpackages%2Ftypespec-http-client-python-0.15.0.tgz(iurth4uuk4s6znzuuc7ncenk2q)': dependencies: '@azure-tools/typespec-autorest': 0.58.0(vddu6w2yloigenmssnpyjivoim) '@azure-tools/typespec-azure-core': 0.58.0(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))))(@typespec/rest@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/http@1.2.1(@typespec/compiler@1.2.1(@types/node@22.13.17))(@typespec/streams@0.72.1(@typespec/compiler@1.2.1(@types/node@22.13.17)))))